Nicer method for static builds: Can use vanilla Qt source/include directory now

diff --git a/LameXP.sln b/LameXP.sln
index 7422062..4efe728 100644 (file)
--- 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 f93b907..dc4e266 100644 (file)
--- a/LameXP.vcproj
+++ b/LameXP.vcproj
@@ -189,7 +189,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release Static|Win32"
+                       Name="Release_Static|Win32"
                        OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
                        IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)"
                        ConfigurationType="1"
@@ -221,8 +221,8 @@
                                FavorSizeOrSpeed="1"
                                OmitFramePointers="true"
                                WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="&quot;$(QTDIR_STATIC)\include&quot;;&quot;$(QTDIR_STATIC)\include\QtCore&quot;;&quot;$(QTDIR_STATIC)\include\QtGui&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NO_DEBUG"
+                               AdditionalIncludeDirectories="&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\QtCore&quot;;&quot;$(QTDIR)\include\QtGui&quot;"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_NODLL"
                                MinimalRebuild="false"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="0"
@@ -246,8 +246,9 @@
                                Name="VCLinkerTool"
                                AdditionalOptions="&quot;/MANIFESTDEPENDENCY:type=&apos;win32&apos; name=&apos;Microsoft.Windows.Common-Controls&apos; version=&apos;6.0.0.0&apos; publicKeyToken=&apos;6595b64144ccf1df&apos; language=&apos;*&apos; processorArchitecture=&apos;*&apos;&quot;"
                                AdditionalDependencies="qtmain.lib QtCore.lib QtGui.lib QtSvg.lib qsvg.lib qico.lib Winmm.lib imm32.lib ws2_32.lib"
+                               Version=""
                                LinkIncremental="1"
-                               AdditionalLibraryDirectories="&quot;$(QTDIR_STATIC)\lib&quot;;&quot;$(QTDIR_STATIC)\plugins\imageformats&quot;"
+                               AdditionalLibraryDirectories="&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\lib&quot;;&quot;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats&quot;"
                                IgnoreDefaultLibraryNames=""
                                GenerateDebugInformation="false"
                                AssemblyDebug="0"
@@ -382,7 +383,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -416,7 +417,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -450,7 +451,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -484,7 +485,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -534,7 +535,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -568,7 +569,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -610,7 +611,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -644,7 +645,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -678,7 +679,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -712,7 +713,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -808,7 +809,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -842,7 +843,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -884,7 +885,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -926,7 +927,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -960,7 +961,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -994,7 +995,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"
@@ -1028,7 +1029,7 @@
                                        />
                                </FileConfiguration>
                                <FileConfiguration
-                                       Name="Release Static|Win32"
+                                       Name="Release_Static|Win32"
                                        >
                                        <Tool
                                                Name="VCCustomBuildTool"

diff --git a/etc/Deployment/_build.bat b/etc/Deployment/_build.bat
index 76281db..4a70ca9 100644 (file)
--- a/etc/Deployment/_build.bat
+++ b/etc/Deployment/_build.bat
@@ -11,11 +11,11 @@ call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86
 call "%PATH_QTMSVC%\bin\qtvars.bat"
 REM -----------------------------------------------------------------
 set "LAMEXP_ERROR=1"
-msbuild.exe /property:Configuration=%2 /target:Clean /verbosity:detailed %1
+msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Clean /verbosity:detailed %1
 if exist "%~d1%~p1bin\%~n2\*.exe" GOTO:EOF
 if exist "%~d1%~p1obj\%~n2\*.obj" GOTO:EOF
 echo ----------------------------------------------------------------
-msbuild.exe /property:Configuration=%2 /target:Rebuild /verbosity:detailed %1
+msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Rebuild /verbosity:detailed %1
 echo ----------------------------------------------------------------
 if not exist "%~d1%~p1bin\%~n2\%~n1.exe" GOTO:EOF
 REM -----------------------------------------------------------------

diff --git a/etc/Deployment/_deploy.bat b/etc/Deployment/_deploy.bat
index d405d0f..6d257a1 100644 (file)
--- a/etc/Deployment/_deploy.bat
+++ b/etc/Deployment/_deploy.bat
@@ -17,7 +17,7 @@ if not "%LAMEXP_REDIST%"=="0" (
 REM ------------------------------------------
 set "OUT_PATH=..\..\bin\%LAMEXP_CONFIG%"
 set "OUT_DATE=%DATE:~6,4%-%DATE:~3,2%-%DATE:~0,2%"
-set "OUT_FILE=%OUT_PATH%\..\LameXP.%OUT_DATE%.%LAMEXP_CONFIG%"
+set "OUT_FILE=%OUT_PATH%\..\LameXP.%OUT_DATE%.%LAMEXP_CONFIG:_=-%"
 set "TMP_PATH=%TEMP%\~LameXP.%LAMEXP_CONFIG%.%OUT_DATE%.tmp"
 REM ------------------------------------------
 REM :: READ VERSION INFO ::
@@ -53,7 +53,6 @@ REM :: POST BUILD ::
 REM ------------------------------------------
 rd /S /Q "%TMP_PATH%"
 mkdir "%TMP_PATH%"
-mkdir "%TMP_PATH%\imageformats"
 copy "%OUT_PATH%\*.exe" "%TMP_PATH%"
 REM ------------------------------------------
 if "%LAMEXP_REDIST%"=="1" (
@@ -61,6 +60,7 @@ if "%LAMEXP_REDIST%"=="1" (
        copy "%QTDIR%\bin\QtGui4.dll" "%TMP_PATH%"
        copy "%QTDIR%\bin\QtXml4.dll" "%TMP_PATH%"
        copy "%QTDIR%\bin\QtSvg4.dll" "%TMP_PATH%"
+       mkdir "%TMP_PATH%\imageformats"
        copy "%QTDIR%\plugins\imageformats\q???4.dll" "%TMP_PATH%\imageformats"
 )
 REM ------------------------------------------

diff --git a/etc/Deployment/release_static.bat b/etc/Deployment/release_static.bat
index f24e701..088e726 100644 (file)
--- a/etc/Deployment/release_static.bat
+++ b/etc/Deployment/release_static.bat
@@ -1,4 +1,4 @@
 @echo off
-set "LAMEXP_CONFIG=Release Static"
+set "LAMEXP_CONFIG=Release_Static"
 set "LAMEXP_REDIST=0"
 call _deploy.bat

diff --git a/etc/Prerequisites/qt4_static/info.txt b/etc/Prerequisites/qt4_static/info.txt
new file mode 100644 (file)
index 0000000..a8cf3f5
--- /dev/null
+++ b/etc/Prerequisites/qt4_static/info.txt
@@ -0,0 +1 @@
+In order to make static builds you must put the static Qt libs here!

diff --git a/src/Global.cpp b/src/Global.cpp
index d03655d..e758b48 100644 (file)
--- a/src/Global.cpp
+++ b/src/Global.cpp
@@ -50,11 +50,6 @@
 #include <Psapi.h>
 #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
  */
@@ -393,14 +399,6 @@ void lamexp_ipc_read(unsigned int *command, char* message, size_t buffSize)
 }
 
 /*
- * Communicate with running instance
- */
-void lamexp_handle_multiple_instanced(void)
-{
-
-}
-
-/*
  * Get LameXP temp folder
  */
 const QString &lamexp_temp_folder(void)

diff --git a/src/Global.h b/src/Global.h
index 334a1fd..b216322 100644 (file)
--- 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);