From 6da29305b8d371f933e5f77fc6de2aa21d4c5ea6 Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Sun, 25 Aug 2013 13:22:38 +0200 Subject: mumble, murmur: final adjustments for the win32-static buildenv. With this change, CONFIG(static) on Windows will cause the Mumble client's application logic to be built into a .DLL called mumble_app.dll (based on pcgod's previous DLL changeset). Since src/mumble will now be built as a DLL, a wrapper executable is available in src/mumble_exe. This wrapper is currently implemented such that it will load mumble_app.dll from the directory that it resides in. This means that when building statically, src/mumble and src/mumble_exe will now give us the following products: src/mumble: mumble_app.dll src/mumble_exe: mumble.exe Along with the two major points above, this change also adds a Python script to the build, 'gen-mumble_app-qt-def.py', whose job is to construct a module definition (.def) file for mumble_app.dll. The generated module definition lists the Qt symbols that are needed for the manual positioning plugin to work. If we need to expose more symbols in the future (say we want to implement more plugin kinds than the current positional audio plugins), we now have the infrastructure in place to do that. --- winpaths_static.pri | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 winpaths_static.pri (limited to 'winpaths_static.pri') diff --git a/winpaths_static.pri b/winpaths_static.pri new file mode 100755 index 000000000..ddd0cc894 --- /dev/null +++ b/winpaths_static.pri @@ -0,0 +1,24 @@ +# winpaths_static.pri +# +# This file contains the default paths for Windows dependencies +# when running in the win32-static build environment from the +# mumble-releng repo. +# +# This file is included by winpaths_default.pri if the 'static' +# config option is passed to qmake. +# +# If you want to customize them do NOT CHANGE THIS FILE but instead +# create a winpaths_custom.pri file in this directory and overwrite +# the variables you need to customize. Do NOT COMMIT your custom file +# to the repository. +# + +ICE_PATH = %MUMBLE_PREFIX%/ZeroC-Ice +BZIP2_PATH = %MUMBLE_PREFIX%/bzip2 +PROTOBUF_PATH = %MUMBLE_PREFIX%/protobuf-2.5.0 +OPENSSL_PATH = %MUMBLE_PREFIX%/OpenSSL +LIBSNDFILE_PATH = %MUMBLE_PREFIX%/sndfile +BOOST_PATH = %MUMBLE_PREFIX%/Boost +BONJOUR_PATH = %MUMBLE_PREFIX%/bonjour +ASIO_PATH = %MUMBLE_PREFIX%/asio +G15SDK_PATH = %MUMBLE_PREFIX%/G15SDK/LCDSDK -- cgit v1.2.3