folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the Visual Studio build of simulators which statically link against libSDL.

Browse source
This commit is contained in:
Mark Pizzolato 2013-06-14 05:55:03 -07:00
parent 524460eaf6
commit 31b63f03c5
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Visual Studio Projects/0ReadMe_Projects.txt
View file

@ -48,5 +48,5 @@ in this directory.
If you are using a version of Visual Studio beyond Visual Studio 2008, then If you are using a version of Visual Studio beyond Visual Studio 2008, then
your later version of Visual Studio will automatically convert the Visual your later version of Visual Studio will automatically convert the Visual
Studio 2008 project fils. You should ignore any warnings produced by the Studio 2008 project files. You should ignore any warnings produced by the
conversion process. conversion process.

2
Visual Studio Projects/BuildAll.cmd
View file

@ -34,7 +34,7 @@ for /F "usebackq tokens=3" %%i in (`findstr/C:"#define SIM_VERSION_MODE" ..\sim_
if "%_SIM_PATCH%" equ "-0" set _SIM_PATCH= if "%_SIM_PATCH%" equ "-0" set _SIM_PATCH=
set _ZipName=simh-%_SIM_MAJOR%.%_SIM_MINOR%%_SIM_PATCH%%_SIM_VERSION_MODE%--%D_YYYY%-%D_MM%-%D_DD%-%GIT_COMMIT_ID:~0,8%.zip set _ZipName=simh-%_SIM_MAJOR%.%_SIM_MINOR%%_SIM_PATCH%%_SIM_VERSION_MODE%--%D_YYYY%-%D_MM%-%D_DD%-%GIT_COMMIT_ID:~0,8%.zip
set _ZipPath=..\..\%BIN_REPO%\ set _ZipPath=..\..\%BIN_REPO%\
vcbuild /rebuild Simh.sln "Release|Win32" vcbuild /M2 /useenv /rebuild Simh.sln "Release|Win32"
if exist "%ProgramFiles%\7-Zip\7z.exe" "%ProgramFiles%\7-Zip\7z.exe" a -tzip "%_ZipPath%%_ZipName%" "..\BIN\NT\Win32-Release\*.exe" if exist "%ProgramFiles%\7-Zip\7z.exe" "%ProgramFiles%\7-Zip\7z.exe" a -tzip "%_ZipPath%%_ZipName%" "..\BIN\NT\Win32-Release\*.exe"
if exist "%ProgramFiles(x86)%\7-Zip\7z.exe" "%ProgramFiles(x86)%\7-Zip\7z.exe" a -tzip "%_ZipPath%%_ZipName%" "..\BIN\NT\Win32-Release\*.exe" if exist "%ProgramFiles(x86)%\7-Zip\7z.exe" "%ProgramFiles(x86)%\7-Zip\7z.exe" a -tzip "%_ZipPath%%_ZipName%" "..\BIN\NT\Win32-Release\*.exe"
if exist "%PROGRAMW6432%\7-Zip\7z.exe" "%PROGRAMW6432%\7-Zip\7z.exe" a -tzip "%_ZipPath%%_ZipName%" "..\BIN\NT\Win32-Release\*.exe" if exist "%PROGRAMW6432%\7-Zip\7z.exe" "%PROGRAMW6432%\7-Zip\7z.exe" a -tzip "%_ZipPath%%_ZipName%" "..\BIN\NT\Win32-Release\*.exe"

1
Visual Studio Projects/Pre-Build-Event.cmd
View file

@ -64,6 +64,7 @@ if not exist ../../windows-build/winpcap/Wpdpack/Include/pcap.h goto _notice1
if not exist ../../windows-build/pthreads/pthread.h goto _notice1 if not exist ../../windows-build/pthreads/pthread.h goto _notice1
if "%_X_LIBSDL%" == "" goto _done_build if "%_X_LIBSDL%" == "" goto _done_build
if not exist ../../windows-build/libSDL/SDL-1.2.15/include/SDL.h goto _notice2 if not exist ../../windows-build/libSDL/SDL-1.2.15/include/SDL.h goto _notice2
if not exist "../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)/Lib/x86/dxguid.lib" goto _notice2
goto _done_build goto _done_build
:_notice1 :_notice1
echo **************************************************** echo ****************************************************

4
Visual Studio Projects/VAX610.vcproj
View file

@ -72,7 +72,7 @@
AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib" AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib"
OutputFile="$(OutDir)\MicroVAX1.exe" OutputFile="$(OutDir)\MicroVAX1.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/";"../../windows-build/libSDL/SDL-1.2.15/lib/"" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/";"../../windows-build/libSDL/SDL-1.2.15/lib/";"../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)\Lib\x86""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\VAX610.pdb" ProgramDatabaseFile="$(OutDir)\VAX610.pdb"
SubSystem="1" SubSystem="1"
@ -163,7 +163,7 @@
AdditionalDependencies="wsock32.lib winmm.lib SDL-Static.lib dxguid.lib" AdditionalDependencies="wsock32.lib winmm.lib SDL-Static.lib dxguid.lib"
OutputFile="$(OutDir)\MicroVAX1.exe" OutputFile="$(OutDir)\MicroVAX1.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/";"../../windows-build/libSDL/SDL-1.2.15/lib/"" AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/";"../../windows-build/libSDL/SDL-1.2.15/lib/";"../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)\Lib\x86""
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"

8
Visual Studio Projects/VAX630.vcproj
View file

@ -69,10 +69,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/fixed:no" AdditionalOptions="/fixed:no"
AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib" AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib"
OutputFile="$(OutDir)\MicroVAX2.exe" OutputFile="$(OutDir)\MicroVAX2.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;;&quot;../../windows-build/libSDL/SDL-1.2.15/lib/&quot;" AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;;&quot;../../windows-build/libSDL/SDL-1.2.15/lib/&quot;;&quot;../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)\Lib\x86&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\VAX630.pdb" ProgramDatabaseFile="$(OutDir)\VAX630.pdb"
SubSystem="1" SubSystem="1"
@ -160,10 +160,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/fixed:no" AdditionalOptions="/fixed:no"
AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib SDL-Static.lib dxguid.lib" AdditionalDependencies="wsock32.lib winmm.lib SDL-Static.lib dxguid.lib"
OutputFile="$(OutDir)\MicroVAX2.exe" OutputFile="$(OutDir)\MicroVAX2.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;;&quot;../../windows-build/libSDL/SDL-1.2.15/lib/&quot;" AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;;&quot;../../windows-build/libSDL/SDL-1.2.15/lib/&quot;;&quot;../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)\Lib\x86&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"