From ec0eea9d9c9ab9b35857b609130a98947a98e703 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Thu, 11 Nov 2010 14:11:44 +0100 Subject: [PATCH] Nicer method for static builds: Can use vanilla Qt source/include directory now --- LameXP.sln | 6 ++-- LameXP.vcproj | 43 ++++++++++++++------------- etc/Deployment/_build.bat | 4 +-- etc/Deployment/_deploy.bat | 4 +-- etc/Deployment/release_static.bat | 2 +- etc/Prerequisites/qt4_static/info.txt | 1 + src/Global.cpp | 24 +++++++-------- src/Global.h | 1 - 8 files changed, 42 insertions(+), 43 deletions(-) create mode 100644 etc/Prerequisites/qt4_static/info.txt diff --git a/LameXP.sln b/LameXP.sln index 74220623..4efe7282 100644 --- a/LameXP.sln +++ b/LameXP.sln @@ -6,14 +6,14 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Release Static|Win32 = Release Static|Win32 + Release_Static|Win32 = Release_Static|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Debug|Win32.ActiveCfg = Debug|Win32 {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Debug|Win32.Build.0 = Debug|Win32 - {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release Static|Win32.ActiveCfg = Release Static|Win32 - {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release Static|Win32.Build.0 = Release Static|Win32 + {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 + {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release_Static|Win32.Build.0 = Release_Static|Win32 {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release|Win32.ActiveCfg = Release|Win32 {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/LameXP.vcproj b/LameXP.vcproj index f93b9079..dc4e2660 100644 --- a/LameXP.vcproj +++ b/LameXP.vcproj @@ -189,7 +189,7 @@ /> #endif //_DEBUG -//Disable nasty warning -#ifndef QT_DLL -#pragma warning(disable:4101) -#endif - /////////////////////////////////////////////////////////////////////////////// // TYPES /////////////////////////////////////////////////////////////////////////////// @@ -194,6 +189,12 @@ void lamexp_init_console(int argc, char* argv[]) } } +/* Disable nasty warning */ +#if !defined(QT_DLL) || defined(QT_NODLL) +#pragma warning(push) +#pragma warning(disable:4101) +#endif + /* * Initialize Qt framework */ @@ -268,6 +269,11 @@ bool lamexp_init_qt(int argc, char* argv[]) return true; } +/* Re-enable the warning */ +#if !defined(QT_DLL) || defined(QT_NODLL) +#pragma warning(pop) +#endif + /* * Initialize IPC */ @@ -392,14 +398,6 @@ void lamexp_ipc_read(unsigned int *command, char* message, size_t buffSize) LAMEXP_DELETE(lamexp_ipc); } -/* - * Communicate with running instance - */ -void lamexp_handle_multiple_instanced(void) -{ - -} - /* * Get LameXP temp folder */ diff --git a/src/Global.h b/src/Global.h index 334a1fd5..b2163223 100644 --- a/src/Global.h +++ b/src/Global.h @@ -48,7 +48,6 @@ bool lamexp_version_demo(void); void lamexp_init_console(int argc, char* argv[]); bool lamexp_init_qt(int argc, char* argv[]); int lamexp_init_ipc(void); -void lamexp_handle_multiple_instanced(void); void lamexp_register_tool(const QString &toolName, LockedFile *file); const QString lamexp_lookup_tool(const QString &toolName); void lamexp_finalization(void);