From a934ad26086ef44563ef7813608e310c0f2dee08 Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Wed, 30 Apr 2014 01:41:51 +1000 Subject: Project file changes (for statically linked vc++ library builds). --- .gitignore | 1 + heimdall-frontend/heimdall-frontend.vcxproj | 65 +++++++++++++++++++++++++++++ heimdall/heimdall.vcxproj | 47 +++++++++++++++++++++ libpit/libpit.vcxproj | 34 +++++++++++++++ msvc2012.sln | 14 +++++++ 5 files changed, 161 insertions(+) diff --git a/.gitignore b/.gitignore index 72747a0..db43406 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ ._* Debug/ Release/ +Release (Static)/ GeneratedFiles/ autom4te.cache/ *.vcxproj.user diff --git a/heimdall-frontend/heimdall-frontend.vcxproj b/heimdall-frontend/heimdall-frontend.vcxproj index 60b1173..a3ae06c 100644 --- a/heimdall-frontend/heimdall-frontend.vcxproj +++ b/heimdall-frontend/heimdall-frontend.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Release (Static) + Win32 + Release Win32 @@ -24,6 +28,10 @@ Application v110 + + Application + v110 + @@ -35,6 +43,10 @@ + + + + <_ProjectFileVersion>10.0.30319.1 @@ -42,16 +54,24 @@ AllRules.ruleset + AllRules.ruleset + + $(SolutionDir)$(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\ + $(SolutionDir)$(Platform)\$(Configuration)\ $(Configuration)\ + $(Configuration)\ $(Configuration)\ $(ProjectDir)include;$(SolutionDir)libpit\Source;$(IncludePath) false + false $(ProjectDir)include;$(SolutionDir)libpit\Source;$(IncludePath) + $(ProjectDir)include;$(SolutionDir)libpit\Source;$(IncludePath) $(ProjectDir)lib\win32;$(LibraryPath) + $(ProjectDir)lib\win32;$(LibraryPath) $(ProjectDir)lib\win32;$(LibraryPath) $(SourcePath) @@ -95,18 +115,43 @@ qtmain.lib;QtCore4.lib;QtGui4.lib;QtXml4.lib;libpit.lib;%(AdditionalDependencies) + + + UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;%(PreprocessorDefinitions) + .\GeneratedFiles;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\qtmain;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtXml;..\libpit\Source;.\;%(AdditionalIncludeDirectories) + + + MultiThreadedDLL + false + + + + + + + Windows + $(OutDir)$(TargetName)$(TargetExt) + $(QTDIR)\lib;$(SolutionDir)$(Platform)\$(Configuration)\lib\;%(AdditionalLibraryDirectories) + false + qtmain.lib;QtCore4.lib;QtGui4.lib;QtXml4.lib;libpit.lib;%(AdditionalDependencies) + + true + true true + true + + true @@ -130,9 +175,13 @@ .\GeneratedFiles\ui_%(Filename).h;%(Outputs) "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) Uic%27ing %(Identity)... + Uic%27ing %(Identity)... .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" @@ -144,9 +193,13 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtXml" "-I." "-I.\..\libpit\Source" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." -D_UNICODE -DQT_CORE_LIB -DQT_GUI_LIB -DQT_LARGEFILE_SUPPORT -DUNICODE -DWIN32 $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... + Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtXml" "-I." "-I.\..\libpit\Source" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DUNICODE -DWIN32 + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtXml" "-I." "-I.\..\libpit\Source" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DUNICODE -DWIN32 @@ -158,9 +211,13 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB -D_UNICODE "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtXml" "-I.\..\libpit\Source" "-I." "-I." "-I." "-I." "-I." "-I." "Source\mainwindow.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" $(QTDIR)\bin\moc.exe;%(FullPath) + $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... + Moc%27ing %(Identity)... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtXml" "-I.\..\libpit\Source" "-I." "-I." "-I." "-I." "-I." "Source\mainwindow.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" + "$(QTDIR)\bin\moc.exe" -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB "-I." "-I.\GeneratedFiles" "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\qtmain" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtXml" "-I.\..\libpit\Source" "-I." "-I." "-I." "-I." "-I." "Source\mainwindow.h" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" @@ -171,9 +228,13 @@ .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp %(FullPath);%(AdditionalInputs) + %(FullPath);%(AdditionalInputs) Rcc%27ing %(Identity)... + Rcc%27ing %(Identity)... .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) + .\GeneratedFiles\qrc_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp + "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\GeneratedFiles\qrc_%(Filename).cpp @@ -184,9 +245,13 @@ .\GeneratedFiles\ui_%(Filename).h;%(Outputs) "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" $(QTDIR)\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) Uic%27ing %(Identity)... + Uic%27ing %(Identity)... .\GeneratedFiles\ui_%(Filename).h;%(Outputs) + .\GeneratedFiles\ui_%(Filename).h;%(Outputs) "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" Designer diff --git a/heimdall/heimdall.vcxproj b/heimdall/heimdall.vcxproj index 558dcd7..9e67582 100644 --- a/heimdall/heimdall.vcxproj +++ b/heimdall/heimdall.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Release (Static) + Win32 + Release Win32 @@ -29,6 +33,13 @@ Unicode v110 + + Application + false + true + Unicode + v110 + @@ -38,6 +49,9 @@ + + + true @@ -51,6 +65,12 @@ $(LibraryPath) $(SolutionDir)$(Platform)\$(Configuration)\ + + false + $(SolutionDir)libpit\Source;$(SolutionDir)libusb-1.0\libusb;$(IncludePath) + $(LibraryPath) + $(SolutionDir)$(Platform)\$(Configuration)\ + NotUsing @@ -101,6 +121,33 @@ xcopy /y $(SolutionDir)libusbx-1.0\lib\$(Platform)\$(Configuration)\libusb-1.0.dll $(SolutionDir)$(Platform)\$(Configuration)\ + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;OS_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + + + + + ..\libusbx-1.0\include;..\libpit\Source + + + Console + true + true + true + libusb-1.0.lib;libpit.lib;%(AdditionalDependencies) + $(SolutionDir)libusbx-1.0\lib\$(Platform)\$(Configuration)\;$(SolutionDir)$(Platform)\$(Configuration)\lib\ + + + xcopy /y $(SolutionDir)libusbx-1.0\lib\$(Platform)\$(Configuration)\libusb-1.0.dll $(SolutionDir)$(Platform)\$(Configuration)\ + + diff --git a/libpit/libpit.vcxproj b/libpit/libpit.vcxproj index 5973763..fb08efc 100644 --- a/libpit/libpit.vcxproj +++ b/libpit/libpit.vcxproj @@ -5,6 +5,10 @@ Debug Win32 + + Release (Static) + Win32 + Release Win32 @@ -35,6 +39,13 @@ Unicode v110 + + StaticLibrary + false + true + Unicode + v110 + @@ -44,6 +55,9 @@ + + + $(SolutionDir)$(Platform)\$(Configuration)\lib\ @@ -51,6 +65,9 @@ $(SolutionDir)$(Platform)\$(Configuration)\lib\ + + $(SolutionDir)$(Platform)\$(Configuration)\lib\ + @@ -81,6 +98,23 @@ true + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + + + Windows + true + true + true + + diff --git a/msvc2012.sln b/msvc2012.sln index e174678..1843f3f 100644 --- a/msvc2012.sln +++ b/msvc2012.sln @@ -18,6 +18,8 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 + Release (Static)|Win32 = Release (Static)|Win32 + Release (Static)|x64 = Release (Static)|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection @@ -25,18 +27,30 @@ Global {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Debug|Win32.ActiveCfg = Debug|Win32 {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Debug|Win32.Build.0 = Debug|Win32 {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Debug|x64.ActiveCfg = Debug|Win32 + {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Release (Static)|Win32.ActiveCfg = Release (Static)|Win32 + {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Release (Static)|Win32.Build.0 = Release (Static)|Win32 + {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Release (Static)|Win32.Deploy.0 = Release (Static)|Win32 + {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Release (Static)|x64.ActiveCfg = Release (Static)|Win32 {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Release|Win32.ActiveCfg = Release|Win32 {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Release|Win32.Build.0 = Release|Win32 {EAD352DF-7CDE-478C-8D70-B0E42A951DEF}.Release|x64.ActiveCfg = Release|Win32 {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Debug|Win32.ActiveCfg = Debug|Win32 {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Debug|Win32.Build.0 = Debug|Win32 {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Debug|x64.ActiveCfg = Debug|Win32 + {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Release (Static)|Win32.ActiveCfg = Release (Static)|Win32 + {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Release (Static)|Win32.Build.0 = Release (Static)|Win32 + {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Release (Static)|Win32.Deploy.0 = Release (Static)|Win32 + {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Release (Static)|x64.ActiveCfg = Release (Static)|Win32 {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Release|Win32.ActiveCfg = Release|Win32 {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Release|Win32.Build.0 = Release|Win32 {DC0D782C-8DB7-44CA-A984-D3A97483E0D0}.Release|x64.ActiveCfg = Release|Win32 {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Debug|Win32.ActiveCfg = Debug|Win32 {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Debug|Win32.Build.0 = Debug|Win32 {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Debug|x64.ActiveCfg = Debug|Win32 + {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Release (Static)|Win32.ActiveCfg = Release (Static)|Win32 + {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Release (Static)|Win32.Build.0 = Release (Static)|Win32 + {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Release (Static)|Win32.Deploy.0 = Release (Static)|Win32 + {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Release (Static)|x64.ActiveCfg = Release (Static)|Win32 {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Release|Win32.ActiveCfg = Release|Win32 {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Release|Win32.Build.0 = Release|Win32 {9506FFE4-3A78-4BEE-A15E-62C5A138E61D}.Release|x64.ActiveCfg = Release|Win32 -- cgit v1.1