diff --git a/Visual Studio Projects/0ReadMe_Projects.txt b/Visual Studio Projects/0ReadMe_Projects.txt index 9d0446e0..c892c0b6 100644 --- a/Visual Studio Projects/0ReadMe_Projects.txt +++ b/Visual Studio Projects/0ReadMe_Projects.txt @@ -48,5 +48,5 @@ in this directory. 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 -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. diff --git a/Visual Studio Projects/BuildAll.cmd b/Visual Studio Projects/BuildAll.cmd index 07ca92a3..06e2a1bf 100644 --- a/Visual Studio Projects/BuildAll.cmd +++ b/Visual Studio Projects/BuildAll.cmd @@ -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= 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%\ -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(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" diff --git a/Visual Studio Projects/Pre-Build-Event.cmd b/Visual Studio Projects/Pre-Build-Event.cmd index 7d6de24b..17cd1a88 100644 --- a/Visual Studio Projects/Pre-Build-Event.cmd +++ b/Visual Studio Projects/Pre-Build-Event.cmd @@ -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 "%_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/Microsoft DirectX SDK (June 2010)/Lib/x86/dxguid.lib" goto _notice2 goto _done_build :_notice1 echo **************************************************** diff --git a/Visual Studio Projects/VAX610.vcproj b/Visual Studio Projects/VAX610.vcproj index d6026ecb..0521fb49 100644 --- a/Visual Studio Projects/VAX610.vcproj +++ b/Visual Studio Projects/VAX610.vcproj @@ -72,7 +72,7 @@ AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib" OutputFile="$(OutDir)\MicroVAX1.exe" 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" ProgramDatabaseFile="$(OutDir)\VAX610.pdb" SubSystem="1" @@ -163,7 +163,7 @@ AdditionalDependencies="wsock32.lib winmm.lib SDL-Static.lib dxguid.lib" OutputFile="$(OutDir)\MicroVAX1.exe" 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" SubSystem="1" OptimizeReferences="2" diff --git a/Visual Studio Projects/VAX630.vcproj b/Visual Studio Projects/VAX630.vcproj index 641f86e9..59e92719 100644 --- a/Visual Studio Projects/VAX630.vcproj +++ b/Visual Studio Projects/VAX630.vcproj @@ -69,10 +69,10 @@