github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-25 19:56:25 +00:00
Code Releases Activity

SCP/VIDEO: Added support for libSDL2 video capabilities. Changed existing video layer to carry pixels as 32bpp vs 8bpp for more natural behaviors in libSDL2.

Browse Source
This commit is contained in:
Mark Pizzolato
2013-10-01 15:55:10 -07:00
parent 351d748b4a
commit 6b45d9b2ad
15 changed files with 926 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Visual Studio Projects/0ReadMe_Projects.txt
View File

@@ -18,7 +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
.../simh/windows-build/libSDL/SDL2-2.0.0/include/SDL.h
The contents of the windows-build directory can be downloaded from:

14
Visual Studio Projects/MicroVAX1.vcproj
View File

@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL-1.2.15/include&quot;"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.0/include&quot;"
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"
@@ -69,10 +69,10 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib"
AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib Imm32.lib Version.lib"
OutputFile="$(OutDir)\MicroVAX1.exe"
LinkIncremental="1"
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;"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.0/lib/&quot;;&quot;../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)\Lib\x86&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MicroVAX1.pdb"
SubSystem="1"
@@ -135,7 +135,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL-1.2.15/include&quot;"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.0/include&quot;"
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"
@@ -160,10 +160,10 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib SDL-Static.lib dxguid.lib"
AdditionalDependencies="wsock32.lib winmm.lib SDL2-Static.lib dxguid.lib Imm32.lib Version.lib"
OutputFile="$(OutDir)\MicroVAX1.exe"
LinkIncremental="1"
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;"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.0/lib/&quot;;&quot;../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)\Lib\x86&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

14
Visual Studio Projects/MicroVAX2.vcproj
View File

@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL-1.2.15/include&quot;"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.0/include&quot;"
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"
@@ -69,10 +69,10 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib SDL-StaticD.lib dxguid.lib"
AdditionalDependencies="wsock32.lib winmm.lib SDL2-StaticD.lib dxguid.lib Imm32.lib Version.lib"
OutputFile="$(OutDir)\MicroVAX2.exe"
LinkIncremental="1"
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;"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.0/lib/&quot;;&quot;../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)\Lib\x86&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\MicroVAX2.pdb"
SubSystem="1"
@@ -135,7 +135,7 @@
FavorSizeOrSpeed="1"
OmitFramePointers="true"
WholeProgramOptimization="true"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL-1.2.15/include&quot;"
AdditionalIncludeDirectories="./;../;../VAX/;../pdp11/;&quot;../../windows-build/winpcap/Wpdpack/Include&quot;;&quot;../../windows-build/pthreads&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.0/include&quot;"
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"
@@ -160,10 +160,10 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib SDL-Static.lib dxguid.lib"
AdditionalDependencies="wsock32.lib winmm.lib SDL2-Static.lib dxguid.lib Imm32.lib Version.lib"
OutputFile="$(OutDir)\MicroVAX2.exe"
LinkIncremental="1"
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;"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;;&quot;../../windows-build/libSDL/SDL2-2.0.0/lib/&quot;;&quot;../../windows-build/libSDL/Microsoft DirectX SDK (June 2010)\Lib\x86&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"

2
Visual Studio Projects/Pre-Build-Event.cmd
View File

@@ -63,7 +63,7 @@ if exist ../../windows-build-windows-build move ../../windows-build-windows-buil
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/SDL2-2.0.0/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

2
Visual Studio Projects/VAX.vcproj
View File

@@ -71,7 +71,7 @@
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)\VAX.exe"
LinkIncremental="1"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\VAX.pdb"

2
Visual Studio Projects/VAX730.vcproj
View File

@@ -70,7 +70,7 @@
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)\VAX730.exe"
LinkIncremental="1"
LinkIncremental="2"
AdditionalLibraryDirectories="../../winpcap/Wpdpack/Lib/;&quot;../../pthreads/Pre-built.2/lib/&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\VAX730.pdb"

2
Visual Studio Projects/VAX750.vcproj
View File

@@ -70,7 +70,7 @@
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)\VAX750.exe"
LinkIncremental="1"
LinkIncremental="2"
AdditionalLibraryDirectories="../../winpcap/Wpdpack/Lib/;&quot;../../pthreads/Pre-built.2/lib/&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\VAX750.pdb"

2
Visual Studio Projects/VAX780.vcproj
View File

@@ -70,7 +70,7 @@
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)\VAX780.exe"
LinkIncremental="1"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\VAX780.pdb"

2
Visual Studio Projects/VAX8600.vcproj
View File

@@ -70,7 +70,7 @@
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)\VAX8600.exe"
LinkIncremental="1"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\VAX8600.pdb"

2
Visual Studio Projects/rtVAX1000.vcproj
View File

@@ -71,7 +71,7 @@
AdditionalOptions="/fixed:no"
AdditionalDependencies="wsock32.lib winmm.lib"
OutputFile="$(OutDir)\rtVAX1000.exe"
LinkIncremental="1"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;../../windows-build/winpcap/Wpdpack/Lib/&quot;"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\rtVAX1000.pdb"