mirror of
https://github.com/simh/simh.git
synced 2026-03-03 18:16:24 +00:00
Merge branch 'master' into KDP
Bring all master changes, including KDP infrastructure, into KDP
This commit is contained in:
@@ -18,6 +18,7 @@ For Example, the directory structure should look like:
|
||||
.../simh/simhv38-2-rc1/BIN/Nt/Win32-Release/vax.exe
|
||||
.../simh/windows-build/pthreads/pthread.h
|
||||
.../simh/windows-build/winpcap/WpdPack/Include/pcap.h
|
||||
.../simh/windows-build/libSDL/SDL-1.2.15/include/SDL.h
|
||||
|
||||
The contents of the windows-build directory can be downloaded from:
|
||||
|
||||
@@ -47,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.
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="VAX610"
|
||||
Name="MicroVAX1"
|
||||
ProjectGUID="{B3671ABB-4FFF-4EEB-8A5B-06716C9BCE9E}"
|
||||
RootNamespace="VAX610"
|
||||
RootNamespace="MicroVAX1"
|
||||
Keyword="Win32Proj"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
@@ -19,7 +19,7 @@
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\VAX610\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\MicroVAX1\$(PlatformName)-$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -27,7 +27,7 @@
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
Description="Build Dependent ROM include File(s) & Check for required build dependencies & git commit id"
|
||||
CommandLine="Pre-Build-Event.cmd ROM BUILD"
|
||||
CommandLine="Pre-Build-Event.cmd ROM BUILD LIBSDL"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
@@ -44,8 +44,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;"../../windows-build/winpcap/Wpdpack/Include";"../../windows-build/pthreads""
|
||||
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_610;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID"
|
||||
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;"../../windows-build/winpcap/Wpdpack/Include";"../../windows-build/pthreads";"../../windows-build/libSDL/SDL-1.2.15/include""
|
||||
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_610;USE_SHARED;USE_SIM_VIDEO;HAVE_LIBSDL;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID"
|
||||
KeepComments="false"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="0"
|
||||
@@ -69,12 +69,12 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/fixed:no"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib"
|
||||
OutputFile="$(OutDir)\MicroVAX1.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/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"
|
||||
ProgramDatabaseFile="$(OutDir)\MicroVAX1.pdb"
|
||||
SubSystem="1"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
@@ -105,7 +105,7 @@
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\VAX610\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\MicroVAX1\$(PlatformName)-$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -113,7 +113,7 @@
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
Description="Build Dependent ROM include File(s) & Check for required build dependencies & git commit id"
|
||||
CommandLine="Pre-Build-Event.cmd ROM BUILD"
|
||||
CommandLine="Pre-Build-Event.cmd ROM BUILD LIBSDL"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
@@ -135,8 +135,8 @@
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;"../../windows-build/winpcap/Wpdpack/Include";"../../windows-build/pthreads""
|
||||
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_610;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID"
|
||||
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;"../../windows-build/winpcap/Wpdpack/Include";"../../windows-build/pthreads";"../../windows-build/libSDL/SDL-1.2.15/include""
|
||||
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_610;USE_SHARED;USE_SIM_VIDEO;HAVE_LIBSDL;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID"
|
||||
KeepComments="false"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
@@ -160,10 +160,10 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/fixed:no"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib SDL-Static.lib dxguid.lib"
|
||||
OutputFile="$(OutDir)\MicroVAX1.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/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"
|
||||
@@ -304,6 +304,10 @@
|
||||
RelativePath="..\sim_tmxr.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sim_video.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax610_io.c"
|
||||
>
|
||||
@@ -324,6 +328,10 @@
|
||||
RelativePath="..\VAX\vax610_syslist.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_2681.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_cis.c"
|
||||
>
|
||||
@@ -344,6 +352,10 @@
|
||||
RelativePath="..\VAX\vax_fpa.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_lk.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_mmu.c"
|
||||
>
|
||||
@@ -360,6 +372,14 @@
|
||||
RelativePath="..\VAX\vax_syscm.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_vc.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_vs.c"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
<Filter
|
||||
Name="Header Files"
|
||||
@@ -437,10 +457,18 @@
|
||||
RelativePath="..\sim_tmxr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sim_video.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax610_defs.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_2681.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_defs.h"
|
||||
>
|
||||
@@ -2,9 +2,9 @@
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="VAX630"
|
||||
Name="MicroVAX2"
|
||||
ProjectGUID="{3048F582-98C9-447D-BBB9-6F969467D4EA}"
|
||||
RootNamespace="VAX630"
|
||||
RootNamespace="MicroVAX2"
|
||||
Keyword="Win32Proj"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
@@ -19,7 +19,7 @@
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\VAX630\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\MicroVAX2\$(PlatformName)-$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -27,7 +27,7 @@
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
Description="Build Dependent ROM include File(s) & Check for required build dependencies & git commit id"
|
||||
CommandLine="Pre-Build-Event.cmd ROM BUILD"
|
||||
CommandLine="Pre-Build-Event.cmd ROM BUILD LIBSDL"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
@@ -44,8 +44,8 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;"../../windows-build/winpcap/Wpdpack/Include";"../../windows-build/pthreads""
|
||||
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_630;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID"
|
||||
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;"../../windows-build/winpcap/Wpdpack/Include";"../../windows-build/pthreads";"../../windows-build/libSDL/SDL-1.2.15/include""
|
||||
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_630;USE_SHARED;USE_SIM_VIDEO;HAVE_LIBSDL;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID"
|
||||
KeepComments="false"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="0"
|
||||
@@ -69,12 +69,12 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/fixed:no"
|
||||
AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib"
|
||||
OutputFile="$(OutDir)\MicroVAX2.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/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)\VAX630.pdb"
|
||||
ProgramDatabaseFile="$(OutDir)\MicroVAX2.pdb"
|
||||
SubSystem="1"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
@@ -105,7 +105,7 @@
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\VAX630\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\MicroVAX2\$(PlatformName)-$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -113,7 +113,7 @@
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
Description="Build Dependent ROM include File(s) & Check for required build dependencies & git commit id"
|
||||
CommandLine="Pre-Build-Event.cmd ROM BUILD"
|
||||
CommandLine="Pre-Build-Event.cmd ROM BUILD LIBSDL"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
@@ -135,8 +135,8 @@
|
||||
FavorSizeOrSpeed="1"
|
||||
OmitFramePointers="true"
|
||||
WholeProgramOptimization="true"
|
||||
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;"../../windows-build/winpcap/Wpdpack/Include";"../../windows-build/pthreads""
|
||||
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_630;USE_SHARED;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID"
|
||||
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;"../../windows-build/winpcap/Wpdpack/Include";"../../windows-build/pthreads";"../../windows-build/libSDL/SDL-1.2.15/include""
|
||||
PreprocessorDefinitions="USE_INT64;USE_ADDR64;VM_VAX;VAX_630;USE_SHARED;USE_SIM_VIDEO;HAVE_LIBSDL;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;USE_READER_THREAD;SIM_ASYNCH_IO;SIM_NEED_GIT_COMMIT_ID"
|
||||
KeepComments="false"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
@@ -160,10 +160,10 @@
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/fixed:no"
|
||||
AdditionalDependencies="wpcap.lib packet.lib wsock32.lib winmm.lib"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib SDL-Static.lib dxguid.lib"
|
||||
OutputFile="$(OutDir)\MicroVAX2.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/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"
|
||||
@@ -304,6 +304,10 @@
|
||||
RelativePath="..\sim_tmxr.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sim_video.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax630_io.c"
|
||||
>
|
||||
@@ -320,6 +324,10 @@
|
||||
RelativePath="..\VAX\vax630_syslist.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_2681.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_cis.c"
|
||||
>
|
||||
@@ -340,6 +348,10 @@
|
||||
RelativePath="..\VAX\vax_fpa.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_lk.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_mmu.c"
|
||||
>
|
||||
@@ -356,6 +368,14 @@
|
||||
RelativePath="..\VAX\vax_syscm.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_vc.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_vs.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_watch.c"
|
||||
>
|
||||
@@ -437,10 +457,18 @@
|
||||
RelativePath="..\sim_tmxr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sim_video.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax630_defs.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_2681.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_defs.h"
|
||||
>
|
||||
@@ -12,7 +12,10 @@ rem ROM images are consistent with the ROM images from which they
|
||||
rem are derived.
|
||||
rem BUILD To validate that the required dependent libraries and include
|
||||
rem files are available in the directory ..\..\windows-build\
|
||||
rem These libraries currently include winpcap and pthreads.
|
||||
rem These libraries currently include winpcap and pthreads and
|
||||
rem optionally SDL.
|
||||
rem LIBSDL To validate that the required dependent SDL libraries and include
|
||||
rem files are available in the directory ..\..\windows-build\
|
||||
rem
|
||||
rem In addition to the optional activities mentioned above, other activities
|
||||
rem are also performed. These include:
|
||||
@@ -30,6 +33,7 @@ if "%1" == "" goto _done_args
|
||||
set _arg=
|
||||
if /I "%1" == "ROM" set _arg=ROM
|
||||
if /I "%1" == "BUILD" set _arg=BUILD
|
||||
if /I "%1" == "LIBSDL" set _arg=LIBSDL
|
||||
if "%_arg%" == "" echo *** warning *** unknown parameter %0
|
||||
if not "%_arg%" == "" set _X_%_arg%=%_arg%
|
||||
shift
|
||||
@@ -56,15 +60,27 @@ popd
|
||||
:_check_build
|
||||
if "%_X_BUILD%" == "" goto _done_build
|
||||
if exist ../../windows-build-windows-build move ../../windows-build-windows-build ../../windows-build >NUL
|
||||
if not exist ../../windows-build/winpcap/Wpdpack/Include/pcap.h goto _notice
|
||||
if not exist ../../windows-build/pthreads/pthread.h goto _notice
|
||||
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
|
||||
:_notice
|
||||
:_notice1
|
||||
echo ****************************************************
|
||||
echo ****************************************************
|
||||
echo ** The required build support is not available. **
|
||||
echo ****************************************************
|
||||
echo ****************************************************
|
||||
goto _ProjectInfo
|
||||
:_notice2
|
||||
echo ****************************************************
|
||||
echo ****************************************************
|
||||
echo ** The required build support is out of date. **
|
||||
echo ****************************************************
|
||||
echo ****************************************************
|
||||
goto _ProjectInfo
|
||||
:_ProjectInfo
|
||||
type 0ReadMe_Projects.txt
|
||||
exit 1
|
||||
:_done_build
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/fixed:no"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib"
|
||||
OutputFile="$(OutDir)\MicroVAX3900.exe"
|
||||
OutputFile="$(OutDir)\VAX.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/""
|
||||
GenerateDebugInformation="true"
|
||||
@@ -101,7 +101,7 @@
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Copy result to legacy binary name (VAX.exe)"
|
||||
CommandLine="if exist "$(TargetPath)" copy "$(TargetPath)" "$(TargetDir)VAX$(TargetExt)" "
|
||||
CommandLine="if exist "$(TargetPath)" copy "$(TargetPath)" "$(TargetDir)MicroVAX3900$(TargetExt)" "
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@@ -163,7 +163,7 @@
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/fixed:no"
|
||||
AdditionalDependencies="wsock32.lib winmm.lib"
|
||||
OutputFile="$(OutDir)\MicroVAX3900.exe"
|
||||
OutputFile="$(OutDir)\VAX.exe"
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/""
|
||||
GenerateDebugInformation="true"
|
||||
@@ -196,7 +196,7 @@
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
Description="Copy result to legacy binary name (VAX.exe)"
|
||||
CommandLine="if exist "$(TargetPath)" copy "$(TargetPath)" "$(TargetDir)VAX$(TargetExt)" "
|
||||
CommandLine="if exist "$(TargetPath)" copy "$(TargetPath)" "$(TargetDir)MicroVAX3900$(TargetExt)" "
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="VAX620"
|
||||
Name="rtVAX1000"
|
||||
ProjectGUID="{E359921B-DC18-42ED-AFB9-1FC603B9C1B3}"
|
||||
RootNamespace="VAX620"
|
||||
RootNamespace="rtVAX1000"
|
||||
Keyword="Win32Proj"
|
||||
TargetFrameworkVersion="131072"
|
||||
>
|
||||
@@ -19,7 +19,7 @@
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\VAX620\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\rtVAX1000\$(PlatformName)-$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -74,7 +74,7 @@
|
||||
LinkIncremental="1"
|
||||
AdditionalLibraryDirectories=""../../windows-build/winpcap/Wpdpack/Lib/""
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(OutDir)\VAX620.pdb"
|
||||
ProgramDatabaseFile="$(OutDir)\rtVAX1000.pdb"
|
||||
SubSystem="1"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
@@ -105,7 +105,7 @@
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\VAX620\$(PlatformName)-$(ConfigurationName)"
|
||||
IntermediateDirectory="..\BIN\NT\Project\simh\rtVAX1000\$(PlatformName)-$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="0"
|
||||
@@ -304,6 +304,10 @@
|
||||
RelativePath="..\sim_tmxr.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sim_video.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax630_io.c"
|
||||
>
|
||||
@@ -320,6 +324,10 @@
|
||||
RelativePath="..\VAX\vax630_syslist.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_2681.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_cis.c"
|
||||
>
|
||||
@@ -340,6 +348,10 @@
|
||||
RelativePath="..\VAX\vax_fpa.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_lk.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_mmu.c"
|
||||
>
|
||||
@@ -356,6 +368,14 @@
|
||||
RelativePath="..\VAX\vax_syscm.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_vc.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_vs.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_watch.c"
|
||||
>
|
||||
@@ -437,10 +457,18 @@
|
||||
RelativePath="..\sim_tmxr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\sim_video.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax630_defs.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_2681.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\VAX\vax_defs.h"
|
||||
>
|
||||
Reference in New Issue
Block a user