diff --git a/Visual Studio Projects/ALTAIR.vcproj b/Visual Studio Projects/ALTAIR.vcproj index 49e56a4..2c66eb2 100644 --- a/Visual Studio Projects/ALTAIR.vcproj +++ b/Visual Studio Projects/ALTAIR.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/AltairZ80.vcproj b/Visual Studio Projects/AltairZ80.vcproj index 2379aee..abd43c4 100644 --- a/Visual Studio Projects/AltairZ80.vcproj +++ b/Visual Studio Projects/AltairZ80.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/B5500.vcproj b/Visual Studio Projects/B5500.vcproj index dc7a958..2cbc564 100644 --- a/Visual Studio Projects/B5500.vcproj +++ b/Visual Studio Projects/B5500.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/BESM6.vcproj b/Visual Studio Projects/BESM6.vcproj index e457e16..856b840 100644 --- a/Visual Studio Projects/BESM6.vcproj +++ b/Visual Studio Projects/BESM6.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/BuildROMs.vcproj b/Visual Studio Projects/BuildROMs.vcproj index 5e088ba..5f653e4 100644 --- a/Visual Studio Projects/BuildROMs.vcproj +++ b/Visual Studio Projects/BuildROMs.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/FrontPanelTest.vcproj b/Visual Studio Projects/FrontPanelTest.vcproj index 70ae79e..edd6df2 100644 --- a/Visual Studio Projects/FrontPanelTest.vcproj +++ b/Visual Studio Projects/FrontPanelTest.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/H316.vcproj b/Visual Studio Projects/H316.vcproj index 300bf8e..0f6ffe9 100644 --- a/Visual Studio Projects/H316.vcproj +++ b/Visual Studio Projects/H316.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/HP2100.vcproj b/Visual Studio Projects/HP2100.vcproj index a21e1cf..1512e0b 100644 --- a/Visual Studio Projects/HP2100.vcproj +++ b/Visual Studio Projects/HP2100.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/HP3000.vcproj b/Visual Studio Projects/HP3000.vcproj index 628d072..af6ee2e 100644 --- a/Visual Studio Projects/HP3000.vcproj +++ b/Visual Studio Projects/HP3000.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I1401.vcproj b/Visual Studio Projects/I1401.vcproj index 6d69a58..8308168 100644 --- a/Visual Studio Projects/I1401.vcproj +++ b/Visual Studio Projects/I1401.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I1620.vcproj b/Visual Studio Projects/I1620.vcproj index e63b4d7..e47d7c3 100644 --- a/Visual Studio Projects/I1620.vcproj +++ b/Visual Studio Projects/I1620.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I701.vcproj b/Visual Studio Projects/I701.vcproj index 584e100..ac27471 100644 --- a/Visual Studio Projects/I701.vcproj +++ b/Visual Studio Projects/I701.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I7010.vcproj b/Visual Studio Projects/I7010.vcproj index 14b1a80..a7cf65f 100644 --- a/Visual Studio Projects/I7010.vcproj +++ b/Visual Studio Projects/I7010.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I704.vcproj b/Visual Studio Projects/I704.vcproj index 5295791..c8dffd4 100644 --- a/Visual Studio Projects/I704.vcproj +++ b/Visual Studio Projects/I704.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I7070.vcproj b/Visual Studio Projects/I7070.vcproj index 460f83d..a2334e4 100644 --- a/Visual Studio Projects/I7070.vcproj +++ b/Visual Studio Projects/I7070.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I7080.vcproj b/Visual Studio Projects/I7080.vcproj index 44711ce..050fa1c 100644 --- a/Visual Studio Projects/I7080.vcproj +++ b/Visual Studio Projects/I7080.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I7090.vcproj b/Visual Studio Projects/I7090.vcproj index 01c0044..adc51e8 100644 --- a/Visual Studio Projects/I7090.vcproj +++ b/Visual Studio Projects/I7090.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/I7094.vcproj b/Visual Studio Projects/I7094.vcproj index 93bef6c..2d70ae1 100644 --- a/Visual Studio Projects/I7094.vcproj +++ b/Visual Studio Projects/I7094.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/IBM1130.vcproj b/Visual Studio Projects/IBM1130.vcproj index 1eb1f1e..3df2890 100644 --- a/Visual Studio Projects/IBM1130.vcproj +++ b/Visual Studio Projects/IBM1130.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/ID16.vcproj b/Visual Studio Projects/ID16.vcproj index 4d59ef2..feba1a8 100644 --- a/Visual Studio Projects/ID16.vcproj +++ b/Visual Studio Projects/ID16.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/ID32.vcproj b/Visual Studio Projects/ID32.vcproj index 405ed92..fb7908a 100644 --- a/Visual Studio Projects/ID32.vcproj +++ b/Visual Studio Projects/ID32.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/MicroVAX1.vcproj b/Visual Studio Projects/MicroVAX1.vcproj index e61852f..99e0325 100644 --- a/Visual Studio Projects/MicroVAX1.vcproj +++ b/Visual Studio Projects/MicroVAX1.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -248,7 +249,7 @@ > @@ -258,7 +259,7 @@ diff --git a/Visual Studio Projects/MicroVAX2.vcproj b/Visual Studio Projects/MicroVAX2.vcproj index 10d8df6..6603b16 100644 --- a/Visual Studio Projects/MicroVAX2.vcproj +++ b/Visual Studio Projects/MicroVAX2.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -248,7 +249,7 @@ > @@ -258,7 +259,7 @@ diff --git a/Visual Studio Projects/NOVA.vcproj b/Visual Studio Projects/NOVA.vcproj index d310702..1cadaf9 100644 --- a/Visual Studio Projects/NOVA.vcproj +++ b/Visual Studio Projects/NOVA.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/PDP1.vcproj b/Visual Studio Projects/PDP1.vcproj index 569e6ab..5f8f42d 100644 --- a/Visual Studio Projects/PDP1.vcproj +++ b/Visual Studio Projects/PDP1.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/PDP10-KA.vcproj b/Visual Studio Projects/PDP10-KA.vcproj index 6d691e0..dbdba88 100644 --- a/Visual Studio Projects/PDP10-KA.vcproj +++ b/Visual Studio Projects/PDP10-KA.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -220,10 +223,22 @@ RelativePath="..\PDP10\ka10_dp.c" > + + + + + + @@ -232,6 +247,14 @@ RelativePath="..\PDP10\ka10_mt.c" > + + + + @@ -252,10 +275,37 @@ RelativePath="..\PDP10\ka10_sys.c" > + + + + + + + + + + @@ -375,6 +425,10 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > + + diff --git a/Visual Studio Projects/PDP10-KI.vcproj b/Visual Studio Projects/PDP10-KI.vcproj index c7761a7..7098946 100644 --- a/Visual Studio Projects/PDP10-KI.vcproj +++ b/Visual Studio Projects/PDP10-KI.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/PDP10.vcproj b/Visual Studio Projects/PDP10.vcproj index f9d1b02..f133880 100644 --- a/Visual Studio Projects/PDP10.vcproj +++ b/Visual Studio Projects/PDP10.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -234,6 +236,10 @@ RelativePath="..\PDP10\pdp10_xtnd.c" > + + @@ -274,7 +280,7 @@ > @@ -284,7 +290,7 @@ diff --git a/Visual Studio Projects/PDP11.vcproj b/Visual Studio Projects/PDP11.vcproj index 745878a..ed50960 100644 --- a/Visual Studio Projects/PDP11.vcproj +++ b/Visual Studio Projects/PDP11.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -194,6 +196,10 @@ RelativePath="..\display\display.c" > + + @@ -290,6 +296,10 @@ RelativePath="..\PDP11\pdp11_rl.c" > + + @@ -370,7 +380,7 @@ > @@ -380,7 +390,7 @@ diff --git a/Visual Studio Projects/PDP15.vcproj b/Visual Studio Projects/PDP15.vcproj index 97e3799..75b805d 100644 --- a/Visual Studio Projects/PDP15.vcproj +++ b/Visual Studio Projects/PDP15.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -192,6 +196,10 @@ RelativePath="..\PDP18B\pdp18b_cpu.c" > + + diff --git a/Visual Studio Projects/PDP4.vcproj b/Visual Studio Projects/PDP4.vcproj index e1ddc7f..67acf84 100644 --- a/Visual Studio Projects/PDP4.vcproj +++ b/Visual Studio Projects/PDP4.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/PDP7.vcproj b/Visual Studio Projects/PDP7.vcproj index 3f02df4..f011286 100644 --- a/Visual Studio Projects/PDP7.vcproj +++ b/Visual Studio Projects/PDP7.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/PDP8.vcproj b/Visual Studio Projects/PDP8.vcproj index dcb4229..a87ef8e 100644 --- a/Visual Studio Projects/PDP8.vcproj +++ b/Visual Studio Projects/PDP8.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/PDP9.vcproj b/Visual Studio Projects/PDP9.vcproj index b8f94e2..e4b5138 100644 --- a/Visual Studio Projects/PDP9.vcproj +++ b/Visual Studio Projects/PDP9.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/PDQ3.vcproj b/Visual Studio Projects/PDQ3.vcproj index 25db7ce..a34447f 100644 --- a/Visual Studio Projects/PDQ3.vcproj +++ b/Visual Studio Projects/PDQ3.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/Post-Build-Event.cmd b/Visual Studio Projects/Post-Build-Event.cmd new file mode 100644 index 0000000..9dfaee6 --- /dev/null +++ b/Visual Studio Projects/Post-Build-Event.cmd @@ -0,0 +1,29 @@ +rem +rem This script performs activities after a simulator build to run +rem simulator specific test activities. Tests are only performed +rem if a simulation test script is available. +rem +rem There are 2 required parameters to this procedure: +rem 1 - The simulator source directory +rem 2 The compiled simulator binary path +rem There are 2 optional parameters to this procedure: +rem 3 A specific test script name +rem 4 Optional parameters to invoke the specified script with +rem +rem + +if exist "%2" goto _check_script +echo error: Missing simulator binary: %2 +exit /B 1 + +:_check_script +set _binary_name=%~n2 +set _script_path=..\%1\tests\%3.ini +if exist "%_script_path%" goto _got_script +set _script_path=..\%1\tests\%_binary_name%_test.ini +if exist "%_script_path%" goto _got_script +echo No tests found for %_binary_name% simulator. +exit /B 0 + +:_got_script +"%2" "%_script_path%" "%4" diff --git a/Visual Studio Projects/Pre-Build-Event.cmd b/Visual Studio Projects/Pre-Build-Event.cmd index 234a105..061f403 100644 --- a/Visual Studio Projects/Pre-Build-Event.cmd +++ b/Visual Studio Projects/Pre-Build-Event.cmd @@ -12,8 +12,8 @@ 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 and -rem optionally SDL and LIBPCRE. +rem These libraries currently include winpcap, pthreads, SDL +rem and LIBPCRE. rem LIBSDL To validate that the required dependent SDL libraries and include rem files are available in the directory ..\..\windows-build\ rem LIBPCRE To validate that the required dependent PCRE libraries and include @@ -21,82 +21,22 @@ 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: -rem - confirming that if the current source is a clone of the simh -rem git repository, then then git hooks which manage making the -rem git commit hash available during builds are properly installed -rem in the repository hooks directory. When the githooks are installed -rem the current commit id is generated if git.exe is available in the -rem current path. -rem - performing the activities which make the git repository commit id -rem available in an include file during compiles. -rem - Converting Visual Studio Projects to a form which will produce -rem binaries which run on Windows XP if the current build environment -rem supports it and the correct components are installed. -rem This activity is triggered by the first argument being the name -rem of a the current Visual Studio project file. This argument MUST -rem only be provided on a single project which invokes this procedure -rem AND that project should be one which all other projects in a -rem solution are dependent on. +rem - performing the activities which make confirm or generate the git +rem repository commit id available in an include file during compiles. rem rem -if "%~x1" == ".vcproj" goto _done_xp_check -if not "%~x1" == ".vcxproj" goto _done_project -if exist PlatformToolset.fix goto _project_cleanup -findstr PlatformToolset %1 >NUL -if ERRORLEVEL 1 goto _next_arg -findstr PlatformToolset %1 | findstr _xp >NUL -if not ERRORLEVEL 1 goto _done_xp_check -echo warning: The %~n1.exe binary can't run on windows XP. -set _XP_Support_Available= -for /r "%PROGRAMDATA%" %%z in (packages\XPSupport\Win_XPSupport.msi) do if exist "%%z" set _XP_Support_Available=1 -if "" == "%_XP_Support_Available%" goto _done_xp_check -if exist PlatformToolset.fix exit /b 1 -echo. >>PlatformToolset.fix -if ERRORLEVEL 1 exit /B 1 -echo warning: Adding Windows XP suppport to all project files at %TIME% - +rem Everything implicitly requires BUILD to also be set to have +rem any meaning, it always gets set. +set _X_BUILD=BUILD call :FindVCVersion _VC_VER -echo Set objFSO = CreateObject("Scripting.FileSystemObject") >>%1.fix.vbs -echo Set objFile = objFSO.OpenTextFile(Wscript.Arguments(0), 1) >>%1.fix.vbs -echo. >>%1.fix.vbs -echo strText = objFile.ReadAll >>%1.fix.vbs -echo objFile.Close >>%1.fix.vbs -echo strText = Replace(strText, "", "_xp") >>%1.fix.vbs -echo. >>%1.fix.vbs -if %_VC_VER% GEQ 14 echo strText = Replace(strText, _>>%1.fix.vbs -if %_VC_VER% GEQ 14 echo "__CLEANUP_C", _>>%1.fix.vbs -if %_VC_VER% GEQ 14 echo "__CLEANUP_C;_USING_V110_SDK71_") _>>%1.fix.vbs -if %_VC_VER% GEQ 14 echo. >>%1.fix.vbs -echo Set objFile = objFSO.OpenTextFile(Wscript.Arguments(0), 2) >>%1.fix.vbs -echo objFile.Write strText >>%1.fix.vbs -echo objFile.Close >>%1.fix.vbs - -call :_Fix_PlatformToolset %1 %1 -for %%f in (*.vcxproj) do call :_Fix_PlatformToolset %1 %%f -call :_GitHooks -del %1.fix.vbs -rem wait a bit here to allow a parallel build of the to complete additional projects -echo Error: Reload the changed projects and start the build again -exit /B 1 -:_Fix_PlatformToolset -findstr PlatformToolset %2 >NUL -if ERRORLEVEL 1 exit /B 0 -findstr PlatformToolset %2 | findstr _xp >NUL -if not ERRORLEVEL 1 exit /B 0 -echo Adding XP support to project %2 -cscript %1.fix.vbs %2 > NUL 2>&1 -exit /B 0 -:_done_xp_check -shift -goto _done_project -:_project_cleanup -shift -del PlatformToolset.fix -:_done_project -if exist PlatformToolset.fix echo error: Reload any changed projects and rebuild again, -if exist PlatformToolset.fix exit /b 1 +set _PDB=%~dpn1.pdb +if exist "%_PDB%" del/q "%_PDB%" +set _PDB= +set _ARG=%~1 +if /i "%_ARG:~-4%" equ ".exe" shift /1 +set _ARG= :_next_arg if "%1" == "" goto _done_args @@ -115,11 +55,6 @@ if not "%_arg%" == "" set _X_%_arg%=%_arg% shift goto _next_arg :_done_args -rem some arguments implicitly require BUILD to also be set to have -rem any meaning. These are LIBSDL, LIBPCRE and FINDFONT -if not "%_X_FINDFONT%" == "" set _X_BUILD=BUILD -if not "%_X_LIBSDL%" == "" set _X_BUILD=BUILD -if not "%_X_LIBPCRE%" == "" set _X_BUILD=BUILD :_do_rom @@ -130,10 +65,11 @@ if exist BIN\NT\Win32-Debug\BuildROMs.exe SET _BLD=BIN\NT\Win32-Debug\BuildROMs. if exist BIN\NT\Win32-Release\BuildROMs.exe SET _BLD=BIN\NT\Win32-Release\BuildROMs.exe if "%_BLD%" == "" echo ************************************************ if "%_BLD%" == "" echo ************************************************ -if "%_BLD%" == "" echo ** Project dependencies not correct. ** +if "%_BLD%" == "" echo ** Project dependencies are not correct. ** if "%_BLD%" == "" echo ** This project should depend on BuildROMs. ** if "%_BLD%" == "" echo ************************************************ if "%_BLD%" == "" echo ************************************************ +if "%_BLD%" == "" echo error: Review the Output Tab for more details. if "%_BLD%" == "" exit 1 %_BLD% if not errorlevel 1 goto _done_rom @@ -144,9 +80,38 @@ goto _do_rom :_done_rom popd +:_CheckGit +if not exist ..\.git goto _done_git +call :FindGit _GIT_GIT +if "%_GIT_GIT%" neq "" goto _done_git +echo ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** +echo ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** +echo ** ** +echo ** Your local simh code is in a git repository, ** +echo ** however, the git program executable can not be ** +echo ** readily found on your system. ** +echo ** ** +echo ** You should download and install git from: ** +echo ** ** +echo ** https://git-scm.com/download/win ** +echo ** ** +echo ** while installing git for windows, be sure to ** +echo ** select the option to "Use Git from the Windows ** +echo ** Command Prompt" ** +echo ** ** +echo ** You should logout and login again after initally ** +echo "" installing git to be sure that the installation ** +echo ** location is properly visible in your search path.** +echo ** ** +echo ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** +echo ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** +echo error: Review the Output Tab for more details. +exit 1 +:_done_git + :_check_build if "%_X_BUILD%" == "" goto _done_build -if not exist ../../windows-build-windows-build goto _check_files +if not exist ..\..\windows-build-windows-build goto _check_files rem This is a newly extracted windows-build.zip file with the rem top level directory named as it existed in the zip file. rem We rename that top level directory. If a previous one already @@ -157,26 +122,39 @@ ren ..\..\windows-build-windows-build windows-build if errorlevel 1 goto _notice3 if exist ../../windows-build-windows-build goto _notice3 :_check_files -if not exist ../../windows-build/winpcap/Wpdpack/Include/pcap.h goto _notice1 -if not exist ../../windows-build/pthreads/pthread.h goto _notice1 -findstr "/c:_MSC_VER >= 1900" ..\..\windows-build\pthreads\pthread.h >NUL -if ERRORLEVEL 1 goto _notice2 -if "%_X_LIBSDL%" == "" goto _done_libsdl -if not exist ../../windows-build/libSDL/SDL2-2.0.5/include/SDL.h goto _notice2 -if not exist "..\..\windows-build\libpng-1.6.18\projects\vstudio\Release Library\*" goto _notice2 -if not exist "../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)/Lib/x86/dxguid.lib" goto _notice2 -findstr "/c:LIBSDL_FTOL2_SSE" ..\..\windows-build\Windows-Build_Versions.txt >NUL -if ERRORLEVEL 1 goto _notice2 -findstr "/c:LIBSDL_ALLMUL" ..\..\windows-build\Windows-Build_Versions.txt >NUL -if ERRORLEVEL 1 goto _notice2 -findstr "/c:LIBSDL_ALLSHR" ..\..\windows-build\Windows-Build_Versions.txt >NUL -if ERRORLEVEL 1 goto _notice2 +call :FindVCVersion _VC_VER +if not exist ..\..\windows-build goto _notice1 +if not exist ..\..\windows-build/lib goto _notice2 +set _X_WINDOWS_BUILD= +for /F "usebackq tokens=2" %%i in (`findstr /C:"WINDOWS-BUILD" ..\..\windows-build\Windows-Build_Versions.txt`) do SET _X_WINDOWS_BUILD=%%i +if "%_X_WINDOWS_BUILD%" LSS "20181002" goto _notice2 +set _X_LAST_WINDOWS_BUILD= +if exist Pre-Build-Event.last-windows-build-version.txt for /F "usebackq tokens=2" %%i in (`findstr /C:"WINDOWS-BUILD" Pre-Build-Event.last-windows-build-version.txt`) do SET _X_LAST_WINDOWS_BUILD=%%i +if "%_X_WINDOWS_BUILD%" EQU "%_X_LAST_WINDOWS_BUILD%" goto _new_or_same_windows_build +echo Library support has been updated, forcing clean version determination +if exist ../../windows-build/lib/Debug rmdir/s/q ..\..\windows-build\lib\Debug +if exist ../../windows-build/lib/Release rmdir/s/q ..\..\windows-build\lib\Release +if exist ../../windows-build/lib/VisualCVersionSupport.txt del ..\..\windows-build\lib\VisualCVersionSupport.txt +echo WINDOWS-BUILD %_X_WINDOWS_BUILD% >Pre-Build-Event.last-windows-build-version.txt +:_new_or_same_windows_build +set _X_WINDOWS_BUILD= +set _X_LAST_WINDOWS_BUILD= +if not exist ../../windows-build/lib/VisualCVersionSupport.txt goto _find_vc_support + +set _X_VC_VER= +for /F "usebackq tokens=2*" %%i in (`findstr /C:"_VC_VER=%_VC_VER% " ..\..\windows-build\lib\VisualCVersionSupport.txt`) do SET _X_VC_VER=%%i %%j +if "%_X_VC_VER%" neq "" echo Library support for %_X_VC_VER% is available +if "%_X_VC_VER%" neq "" goto _done_libsdl +:_find_vc_support +set _X_VC_VER_DIR= +for /d %%i in ("../../windows-build/lib/*") do call :CheckDirectoryVCSupport _X_VC_VER_DIR %%i "../../windows-build/lib/" +if "%_X_VC_VER_DIR%" equ "" goto _notice4 +:_make_vc_support_active +for /F "usebackq tokens=2*" %%i in (`findstr /C:"_VC_VER=%_VC_VER% " "%_X_VC_VER_DIR%\VisualCVersionSupport.txt"`) do SET _X_VC_VER=%%i %%j +echo Enabling Library support for %_X_VC_VER% +call "%_X_VC_VER_DIR%\Install-Library-Support.cmd" :_done_libsdl -if "%_X_LIBPCRE%" == "" goto _done_libpcre -if not exist ../../windows-build/PCRE/include/pcreposix.h goto _notice2 -:_done_libpcre if "%_X_FINDFONT%" == "" goto _done_findfont -if not exist ../../windows-build/libSDL/SDL2_ttf-2.0.12/SDL_ttf.h goto _notice2 if "%_X_FontName%" == "" goto _done_findfont echo. >%_X_FontIncludeName%.temp set FONTFILE=%windir%\Fonts\%_X_FontName% @@ -214,6 +192,29 @@ set _LIB_VC_VER= :_done_library goto _done_build :_notice1 +if "%_TRIED_CLONE%" neq "" goto _notice1_announce +if "%_GIT_GIT%" equ "" goto _notice1_announce +echo ***************************************************** +echo ***************************************************** +echo ** ** +echo ** The required build support is not yet available.** +echo ** ** +echo ** Using git to acquire a local copy of the ** +echo ** windows-build repository from: ** +echo ** ** +echo ** https://github.com/simh/windows-build ** +echo ** ** +echo ** This may take a minute or si. Please wait... ** +echo ** ** +echo ***************************************************** +echo ***************************************************** +:_try_clone +pushd ..\.. +"%_GIT_GIT%" clone https://github.com/simh/windows-build windows-build +popd +set _TRIED_CLONE=1 +goto _check_build +:_notice1_announce echo ***************************************************** echo ***************************************************** echo ** The required build support is not available. ** @@ -222,6 +223,42 @@ echo ***************************************************** set _exit_reason=The required build support is not available. goto _ProjectInfo :_notice2 +if "%_TRIED_PULL%" neq "" goto _notice2_announce +if "%_GIT_GIT%" equ "" goto _notice2_announce +if exist ..\..\windows-build\.git goto _try_pull +echo ***************************************************** +echo ***************************************************** +echo ** ** +echo ** The required build support is out of date ** +echo ** and currently isn't a git repository. ** +echo ** ** +echo ** Removing the current windows-build support ** +echo ** in preparation for cloning the current ** +echo ** windows-build git repository. ** +echo ** ** +echo ** This may take several minutes... ** +echo ** ** +echo ***************************************************** +echo ***************************************************** +rmdir /s /q ..\..\windows-build +goto _try_clone +:_try_pull +echo ***************************************************** +echo ***************************************************** +echo ** ** +echo ** The required build support is out of date. ** +echo ** ** +echo ** Attempting update of your local windows-build ** +echo ** git repository. This may take a minute... ** +echo ** ** +echo ***************************************************** +echo ***************************************************** +pushd ..\..\windows-build +"%_GIT_GIT%" pull https://github.com/simh/windows-build +popd +set _TRIED_PULL=1 +goto _check_build +:_notice2_announce echo ***************************************************** echo ***************************************************** echo ** The required build support is out of date. ** @@ -238,6 +275,26 @@ echo ***************************************************** echo ***************************************************** set _exit_reason=Can't rename ../../windows-build-windows-build to ../../windows-build goto _ProjectInfo +:_notice4 +echo ********************************* +echo ********************************* +echo ** Visual Studio Version: %_VC_VER% ** +echo ** Visual Studio Version: %_VC_VER% ** +echo ** Visual Studio Version: %_VC_VER% ** +echo ** Visual Studio Version: %_VC_VER% ** +echo ***************************************************** +echo ***************************************************** +echo ** Windows Build support for your Microsoft ** +echo ** Visual Studio version is not available yet. ** +echo ** Please create a new issue at: ** +echo ** https://github.com/simh/simh/issues describing ** +echo ** what you've done and support should be added ** +echo ** soon. Otherwise, you can install an earlier ** +echo ** version of Microsoft Visual Studio and use ** +echo ** that. ** +echo ***************************************************** +echo ***************************************************** +goto _ProjectInfo :_ProjectInfo type 0ReadMe_Projects.txt echo error: %_exit_reason% @@ -245,21 +302,34 @@ echo error: Review the Output Tab for more details. exit 1 :_done_build -:_GitHooks -if not exist ..\.git goto _done_hooks -if exist ..\.git\hooks\post-commit goto _done_hooks -echo ***************************************************** -echo ***************************************************** -echo ** Installing git hooks in newly cloned repository ** -echo ***************************************************** -echo ***************************************************** -copy /y git-hooks\post* ..\.git\hooks\ -call :WhereInPath git.exe > NUL 2>&1 -if %ERRORLEVEL% neq 0 goto _done_hooks -pushd .. -git log -1 "--pretty=%%H" >.git-commit-id -popd -:_done_hooks +:_CheckGit +if not exist ..\.git goto _done_id +call :FindGit _GIT_GIT +if "%_GIT_GIT%" neq "" goto _SetId +echo ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** +echo ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** +echo ** ** +echo ** Your local simh code is in a git repository, ** +echo ** however, the git program executable can not be ** +echo ** readily found on your system. ** +echo ** ** +echo ** You should download and install git from: ** +echo ** ** +echo ** https://git-scm.com/download/win ** +echo ** ** +echo ** while installing git for windows, be sure to ** +echo ** select the option to "Use Git from the Windows ** +echo ** Command Prompt" ** +echo ** ** +echo ** You should logout and login again after initally ** +echo "" installing git to be sure that the installation ** +echo ** location is properly visible in your search path.** +echo ** ** +echo ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** +echo ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** ERROR ** +echo error: Review the Output Tab for more details. +exit 1 +:_done_git :_SetId rem @@ -267,22 +337,35 @@ rem A race condition exists while creating the .git-commit-id.h file. rem This race can happen at the beginning of a parallel build where rem several projects can start execution at almost the same time. rem +SET ACTUAL_GIT_COMMIT_ID= +SET ACTUAL_GIT_COMMIT_TIME= SET GIT_COMMIT_ID= -if not exist ..\.git-commit-id goto _NoId -for /F %%i in (..\.git-commit-id) do SET GIT_COMMIT_ID=%%i -:_NoId +SET GIT_COMMIT_TIME= +for /F "usebackq tokens=1" %%i in (`git log -1 "--pretty=%%H"`) do SET ACTUAL_GIT_COMMIT_ID=%%i +for /F "usebackq tokens=1" %%i in (`git log -1 "--pretty=%%aI"`) do SET ACTUAL_GIT_COMMIT_TIME=%%i +if exist ..\.git-commit-id for /F "usebackq tokens=2" %%i in (`findstr /C:SIM_GIT_COMMIT_ID ..\.git-commit-id`) do SET GIT_COMMIT_ID=%%i +if exist ..\.git-commit-id for /F "usebackq tokens=2" %%i in (`findstr /C:SIM_GIT_COMMIT_TIME ..\.git-commit-id`) do SET GIT_COMMIT_TIME=%%i +if "%ACTUAL_GIT_COMMIT_ID%" neq "%GIT_COMMIT_ID%" "%_GIT_GIT%" log -1 --pretty="SIM_GIT_COMMIT_ID %%H%%nSIM_GIT_COMMIT_TIME %%aI" >..\.git-commit-id +SET GIT_COMMIT_ID=%ACTUAL_GIT_COMMIT_ID% +SET GIT_COMMIT_TIME=%ACTUAL_GIT_COMMIT_TIME% +SET ACTUAL_GIT_COMMIT_ID= +SET ACTUAL_GIT_COMMIT_TIME= +:_VerifyGitCommitId.h SET OLD_GIT_COMMIT_ID= if not exist .git-commit-id.h echo.>.git-commit-id.h -for /F "tokens=3" %%i in (.git-commit-id.h) do SET OLD_GIT_COMMIT_ID=%%i +for /F "usebackq tokens=3" %%i in (`findstr /C:SIM_GIT_COMMIT_ID .git-commit-id.h`) do SET OLD_GIT_COMMIT_ID=%%i if "%GIT_COMMIT_ID%" equ "%OLD_GIT_COMMIT_ID%" goto _IdGood echo Generating updated .git-commit-id.h containing id %GIT_COMMIT_ID% echo #define SIM_GIT_COMMIT_ID %GIT_COMMIT_ID% >.git-commit-id.h +echo #define SIM_GIT_COMMIT_TIME %GIT_COMMIT_TIME% >>.git-commit-id.h if errorlevel 1 echo Retrying... if errorlevel 1 goto _SetId :_IdGood :_done_id +if not exist .git-commit-id.h echo. >.git-commit-id.h goto :EOF + :WhereInPath if "%~$PATH:1" NEQ "" exit /B 0 exit /B 1 @@ -292,9 +375,24 @@ if "%~$PATH:1" EQU "" exit /B 1 set %2=%~$PATH:1 exit /B 0 +:FindGit +set _GIT_TMP=%1 +call :WhichInPath git.exe _GIT_TMP_ +if "%_GIT_TMP_%" neq "" goto GitFound +call :WhichInPath cl.exe _VC_CL_ +for /f "tokens=1-4 delims=\" %%a in ("%_VC_CL_%") do set _GIT_BASE_="%%a\%%b\%%c\%%d\" +for /r %_GIT_BASE_% %%a in (git.exe) do if exist "%%a" set _GIT_TMP_=%%a +:GitFound +set %_GIT_TMP%=%_GIT_TMP_% +set _VC_CL_= +set _GIT_BASE_= +set _GIT_TMP_= +set _GIT_TMP= +exit /B 0 + :FindVCVersion call :WhichInPath cl.exe _VC_CL_ -for /f "tokens=2-8 delims=\" %%a in ("%_VC_CL_%") do call :VCCheck _VC_VER_NUM_ "%%a" "%%b" "%%c" "%%d" "%%e" "%%f" "%%g" +for /f "tokens=3-9 delims=\" %%a in ("%_VC_CL_%") do call :VCCheck _VC_VER_NUM_ "%%a" "%%b" "%%c" "%%d" "%%e" "%%f" "%%g" for /f "delims=." %%a in ("%_VC_VER_NUM_%") do set %1=%%a set _VC_CL= exit /B 0 @@ -306,8 +404,38 @@ shift set _VC_TMP_=%~1 if "%_VC_TMP_%" equ "" goto _VCCheck_Done if "%_VC_TMP_:~0,24%" EQU "Microsoft Visual Studio " set %_VC_TMP%=%_VC_TMP_:Microsoft Visual Studio =% +call :IsNumeric _VC_NUM_ %_VC_TMP_% +if "%_VC_NUM_%" neq "" set %_VC_TMP%=%~1 +if "%_VC_NUM_%" neq "" goto _VCCheck_Done goto _VCCheck_Next :_VCCheck_Done set _VC_TMP_= set _VC_TMP= +set _VC_NUM_= +exit /B 0 + +:CheckDirectoryVCSupport +set _VC_Check_Path=%~3%~2/ +set _VC_Check_Path=%_VC_Check_Path:/=\% +if not exist "%_VC_Check_Path%VisualCVersionSupport.txt" exit /B 1 +for /F "usebackq tokens=2*" %%k in (`findstr /C:"_VC_VER=%_VC_VER% " "%_VC_Check_Path%VisualCVersionSupport.txt"`) do set %1=%_VC_Check_Path% +exit /B 0 + +:IsNumeric +set _Numeric_TMP_=%~1 +set _Numeric_Test_=%2 +set _Numeric_Test_=%_Numeric_Test_:~0,1% +set %_Numeric_TMP_%= +if "%_Numeric_Test_%"=="0" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="1" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="2" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="3" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="4" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="5" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="6" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="7" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="8" set %_Numeric_TMP_%=1 +if "%_Numeric_Test_%"=="9" set %_Numeric_TMP_%=1 +set _Numeric_TMP_= +set _Numeric_Test_= exit /B 0 diff --git a/Visual Studio Projects/S3.vcproj b/Visual Studio Projects/S3.vcproj index 63ffafc..7639662 100644 --- a/Visual Studio Projects/S3.vcproj +++ b/Visual Studio Projects/S3.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/SAGE.vcproj b/Visual Studio Projects/SAGE.vcproj index 771c22e..6bd1784 100644 --- a/Visual Studio Projects/SAGE.vcproj +++ b/Visual Studio Projects/SAGE.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/SDS.vcproj b/Visual Studio Projects/SDS.vcproj index d160a44..923e0ae 100644 --- a/Visual Studio Projects/SDS.vcproj +++ b/Visual Studio Projects/SDS.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/SSEM.vcproj b/Visual Studio Projects/SSEM.vcproj index 192e32b..9c53304 100644 --- a/Visual Studio Projects/SSEM.vcproj +++ b/Visual Studio Projects/SSEM.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/Simh.sln b/Visual Studio Projects/Simh.sln index f14d7ea..ab8bea5 100644 --- a/Visual Studio Projects/Simh.sln +++ b/Visual Studio Projects/Simh.sln @@ -244,10 +244,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isys8024", "isys8024.vcproj EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imds-225", "imds-225.vcproj", "{A66F0D85-174F-4AFE-A44E-7FAE3D3727BC}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ibmpc", "ibmpc.vcproj", "{76EF8599-7AB0-4C8D-997B-AAEEE724A5D0}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ibmpcxt", "ibmpcxt.vcproj", "{0026A4C2-655A-4C03-B6CA-B1EAF79FA4D1}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scelbi", "scelbi.vcproj", "{1E92CC4B-9ED5-4CD4-BD35-061F25126523}" ProjectSection(ProjectDependencies) = postProject @@ -260,6 +269,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3B2", "3B2.vcproj", "{56178 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I701", "I701.vcproj", "{F1F44607-FB9E-428C-AD8F-56F98699D121}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I7090", "I7090.vcproj", "{33EE34FC-A12F-47FE-9FD6-8B74D08718C7}" ProjectSection(ProjectDependencies) = postProject @@ -286,6 +298,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "I7010", "I7010.vcproj", "{5 {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UC15", "UC15.vcproj", "{B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP10-KA", "PDP10-KA.vcproj", "{01F75DE5-8049-4C73-A325-B1F9964CE709}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDP10-KI", "PDP10-KI.vcproj", "{0BA63EC5-BD4F-44FB-AE89-7DD2C84CB1D9}" + ProjectSection(ProjectDependencies) = postProject + {D40F3AF1-EEE7-4432-9807-2AD287B490F8} = {D40F3AF1-EEE7-4432-9807-2AD287B490F8} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -532,6 +559,18 @@ Global {55A727F0-B5C8-48E8-9EF2-D5DAF679C520}.Debug|Win32.Build.0 = Debug|Win32 {55A727F0-B5C8-48E8-9EF2-D5DAF679C520}.Release|Win32.ActiveCfg = Release|Win32 {55A727F0-B5C8-48E8-9EF2-D5DAF679C520}.Release|Win32.Build.0 = Release|Win32 + {B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}.Debug|Win32.ActiveCfg = Debug|Win32 + {B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}.Debug|Win32.Build.0 = Debug|Win32 + {B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}.Release|Win32.ActiveCfg = Release|Win32 + {B5E9D32E-53F9-4C9B-B037-5A2D34E370CF}.Release|Win32.Build.0 = Release|Win32 + {01F75DE5-8049-4C73-A325-B1F9964CE709}.Debug|Win32.ActiveCfg = Debug|Win32 + {01F75DE5-8049-4C73-A325-B1F9964CE709}.Debug|Win32.Build.0 = Debug|Win32 + {01F75DE5-8049-4C73-A325-B1F9964CE709}.Release|Win32.ActiveCfg = Release|Win32 + {01F75DE5-8049-4C73-A325-B1F9964CE709}.Release|Win32.Build.0 = Release|Win32 + {0BA63EC5-BD4F-44FB-AE89-7DD2C84CB1D9}.Debug|Win32.ActiveCfg = Debug|Win32 + {0BA63EC5-BD4F-44FB-AE89-7DD2C84CB1D9}.Debug|Win32.Build.0 = Debug|Win32 + {0BA63EC5-BD4F-44FB-AE89-7DD2C84CB1D9}.Release|Win32.ActiveCfg = Release|Win32 + {0BA63EC5-BD4F-44FB-AE89-7DD2C84CB1D9}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Visual Studio Projects/TX-0.vcproj b/Visual Studio Projects/TX-0.vcproj index 80c1401..7d7fd80 100644 --- a/Visual Studio Projects/TX-0.vcproj +++ b/Visual Studio Projects/TX-0.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/VAX.vcproj b/Visual Studio Projects/VAX.vcproj index 3f6504d..8403f55 100644 --- a/Visual Studio Projects/VAX.vcproj +++ b/Visual Studio Projects/VAX.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -252,7 +249,7 @@ > @@ -262,7 +259,7 @@ diff --git a/Visual Studio Projects/VAX730.vcproj b/Visual Studio Projects/VAX730.vcproj index 3136767..fc35ed2 100644 --- a/Visual Studio Projects/VAX730.vcproj +++ b/Visual Studio Projects/VAX730.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" + CharacterSet="0" > @@ -193,6 +195,10 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" > + + @@ -265,7 +271,7 @@ > @@ -275,7 +281,7 @@ diff --git a/Visual Studio Projects/VAX750.vcproj b/Visual Studio Projects/VAX750.vcproj index 47f90fa..5e32a5d 100644 --- a/Visual Studio Projects/VAX750.vcproj +++ b/Visual Studio Projects/VAX750.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" + CharacterSet="0" > @@ -193,6 +195,10 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" > + + @@ -273,7 +279,7 @@ > @@ -283,7 +289,7 @@ diff --git a/Visual Studio Projects/VAX780.vcproj b/Visual Studio Projects/VAX780.vcproj index 9c9b565..460e6c1 100644 --- a/Visual Studio Projects/VAX780.vcproj +++ b/Visual Studio Projects/VAX780.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -194,6 +195,10 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" > + + @@ -278,7 +283,7 @@ > @@ -288,7 +293,7 @@ diff --git a/Visual Studio Projects/VAX8600.vcproj b/Visual Studio Projects/VAX8600.vcproj index 5e65c70..af45c2c 100644 --- a/Visual Studio Projects/VAX8600.vcproj +++ b/Visual Studio Projects/VAX8600.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -194,6 +195,10 @@ Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm" > + + @@ -278,7 +283,7 @@ > @@ -288,7 +293,7 @@ diff --git a/Visual Studio Projects/alpha.vcproj b/Visual Studio Projects/alpha.vcproj index db25417..fcf18b6 100644 --- a/Visual Studio Projects/alpha.vcproj +++ b/Visual Studio Projects/alpha.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/git-hooks/0ReadMe_git-hooks.txt b/Visual Studio Projects/git-hooks/0ReadMe_git-hooks.txt deleted file mode 100644 index d9126d7..0000000 --- a/Visual Studio Projects/git-hooks/0ReadMe_git-hooks.txt +++ /dev/null @@ -1,28 +0,0 @@ -This dirctory contains a set of git hook scripts which are useful when -working with this repository to make the git commit id available when -building simulators to uniquely identify the inputs to that build. - -It is ONLY useful for folks who clone this as a repository and build -in the working directory of that repository. - -Folks who download zip archives of the repository do not currently -have the ability to get the commit id which the archive is a snapshot -of. Work is being done to solve this issue for uses of the archive -snapshots as well. - -To use these scripts automatically, copy these files to the .git/hooks -directory of the current repository. This can be done with the -following commands: - - $ cd Visual\ Studio\ Projects/git-hooks - $ chmod +x post* - $ cp post* ../../.git/hooks/ - - - -Note: You ONLY need to copy these hook scripts once for a particular - clone of the repository. Once these are installed they will - survive as you pull subsequent revisions from the github repo. - - If you clone the repository to another platform, then you'll - need to copy the hooks to the .git/hooks directory again. diff --git a/Visual Studio Projects/git-hooks/post-checkout b/Visual Studio Projects/git-hooks/post-checkout deleted file mode 100644 index 05588ba..0000000 --- a/Visual Studio Projects/git-hooks/post-checkout +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# -# A hook script that is called after a successful -# checkout to record the commit-id in the working directory. -git log -1 --pretty="%H" >.git-commit-id diff --git a/Visual Studio Projects/git-hooks/post-commit b/Visual Studio Projects/git-hooks/post-commit deleted file mode 100644 index 32d3e49..0000000 --- a/Visual Studio Projects/git-hooks/post-commit +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# -# A hook script that is called after a successful -# commit is made to record the commit-id in the working directory. -git log -1 --pretty="%H" >.git-commit-id diff --git a/Visual Studio Projects/git-hooks/post-merge b/Visual Studio Projects/git-hooks/post-merge deleted file mode 100644 index 9de878e..0000000 --- a/Visual Studio Projects/git-hooks/post-merge +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# -# A hook script that is called after a successful merge -# to record the commit-id in the working directory. -git log -1 --pretty="%H" >.git-commit-id diff --git a/Visual Studio Projects/isys8010.vcproj b/Visual Studio Projects/isys8010.vcproj index fddc6bd..1d2bd48 100644 --- a/Visual Studio Projects/isys8010.vcproj +++ b/Visual Studio Projects/isys8010.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/isys8020.vcproj b/Visual Studio Projects/isys8020.vcproj index d0bf169..ff8864a 100644 --- a/Visual Studio Projects/isys8020.vcproj +++ b/Visual Studio Projects/isys8020.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/lgp.vcproj b/Visual Studio Projects/lgp.vcproj index 21ea5e3..1529a1a 100644 --- a/Visual Studio Projects/lgp.vcproj +++ b/Visual Studio Projects/lgp.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/rtVAX1000.vcproj b/Visual Studio Projects/rtVAX1000.vcproj index d9918b0..4687d38 100644 --- a/Visual Studio Projects/rtVAX1000.vcproj +++ b/Visual Studio Projects/rtVAX1000.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > @@ -248,7 +249,7 @@ > @@ -258,7 +259,7 @@ diff --git a/Visual Studio Projects/sigma.vcproj b/Visual Studio Projects/sigma.vcproj index d30dab7..119bec1 100644 --- a/Visual Studio Projects/sigma.vcproj +++ b/Visual Studio Projects/sigma.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/swtp6800mp-a.vcproj b/Visual Studio Projects/swtp6800mp-a.vcproj index cda3c82..dc9f36d 100644 --- a/Visual Studio Projects/swtp6800mp-a.vcproj +++ b/Visual Studio Projects/swtp6800mp-a.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" > diff --git a/Visual Studio Projects/swtp6800mp-a2.vcproj b/Visual Studio Projects/swtp6800mp-a2.vcproj index 6150da7..674677a 100644 --- a/Visual Studio Projects/swtp6800mp-a2.vcproj +++ b/Visual Studio Projects/swtp6800mp-a2.vcproj @@ -21,13 +21,12 @@ OutputDirectory="..\BIN\NT\$(PlatformName)-$(ConfigurationName)" IntermediateDirectory="..\BIN\NT\Project\simh\$(ProjectName)\$(PlatformName)-$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="0" >