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
/>
</Configuration>
<Configuration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)"
ConfigurationType="1"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
WholeProgramOptimization="true"
- AdditionalIncludeDirectories=""$(QTDIR_STATIC)\include";"$(QTDIR_STATIC)\include\QtCore";"$(QTDIR_STATIC)\include\QtGui""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_NO_DEBUG"
+ AdditionalIncludeDirectories=""$(QTDIR)\include";"$(QTDIR)\include\QtCore";"$(QTDIR)\include\QtGui""
+ 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"
Name="VCLinkerTool"
AdditionalOptions=""/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'""
AdditionalDependencies="qtmain.lib QtCore.lib QtGui.lib QtSvg.lib qsvg.lib qico.lib Winmm.lib imm32.lib ws2_32.lib"
+ Version=""
LinkIncremental="1"
- AdditionalLibraryDirectories=""$(QTDIR_STATIC)\lib";"$(QTDIR_STATIC)\plugins\imageformats""
+ AdditionalLibraryDirectories=""$(SolutionDir)\etc\Prerequisites\qt4_static\lib";"$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats""
IgnoreDefaultLibraryNames=""
GenerateDebugInformation="false"
AssemblyDebug="0"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Release Static|Win32"
+ Name="Release_Static|Win32"
>
<Tool
Name="VCCustomBuildTool"
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 -----------------------------------------------------------------
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 ::
REM ------------------------------------------
rd /S /Q "%TMP_PATH%"
mkdir "%TMP_PATH%"
-mkdir "%TMP_PATH%\imageformats"
copy "%OUT_PATH%\*.exe" "%TMP_PATH%"
REM ------------------------------------------
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 ------------------------------------------
@echo off
-set "LAMEXP_CONFIG=Release Static"
+set "LAMEXP_CONFIG=Release_Static"
set "LAMEXP_REDIST=0"
call _deploy.bat
--- /dev/null
+In order to make static builds you must put the static Qt libs here!
#include <Psapi.h>
#endif //_DEBUG
-//Disable nasty warning
-#ifndef QT_DLL
-#pragma warning(disable:4101)
-#endif
-
///////////////////////////////////////////////////////////////////////////////
// TYPES
///////////////////////////////////////////////////////////////////////////////
}
}
+/* Disable nasty warning */
+#if !defined(QT_DLL) || defined(QT_NODLL)
+#pragma warning(push)
+#pragma warning(disable:4101)
+#endif
+
/*
* Initialize Qt framework
*/
return true;
}
+/* Re-enable the warning */
+#if !defined(QT_DLL) || defined(QT_NODLL)
+#pragma warning(pop)
+#endif
+
/*
* Initialize IPC
*/
}
/*
- * Communicate with running instance
- */
-void lamexp_handle_multiple_instanced(void)
-{
-
-}
-
-/*
* Get LameXP temp folder
*/
const QString &lamexp_temp_folder(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);