Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

make build scripts reference both video_sdl.cpp and video_sdl2.cpp

This commit is contained in:
David Ludwig 2017-09-04 12:44:34 -04:00
parent a646f6dc3f
commit 8940880794
9 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
View File

@ -106,6 +106,7 @@
756C1B391F25306A00620917 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 756C1B381F25306A00620917 /* AppKit.framework */; };
757A2BF01F5AF9D6003EDB01 /* user_strings_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 757A2BEF1F5AF9D6003EDB01 /* user_strings_unix.cpp */; };
75CBCF751F5DB3AD00830063 /* video_sdl2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75CBCF741F5DB3AD00830063 /* video_sdl2.cpp */; };
75CBCF771F5DB65E00830063 /* video_sdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75CBCF761F5DB65E00830063 /* video_sdl.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -376,6 +377,7 @@
756C1B381F25306A00620917 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
757A2BEF1F5AF9D6003EDB01 /* user_strings_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_strings_unix.cpp; sourceTree = "<group>"; };
75CBCF741F5DB3AD00830063 /* video_sdl2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_sdl2.cpp; sourceTree = "<group>"; };
75CBCF761F5DB65E00830063 /* video_sdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = video_sdl.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -584,6 +586,7 @@
752F27001F242BAF001032B4 /* prefs_sdl.cpp */,
7539E0721F23B25A006B2DF2 /* audio_sdl.cpp */,
7539E0731F23B25A006B2DF2 /* keycodes */,
75CBCF761F5DB65E00830063 /* video_sdl.cpp */,
75CBCF741F5DB3AD00830063 /* video_sdl2.cpp */,
);
name = SDL;
@ -1052,6 +1055,7 @@
7539E1721F23B25A006B2DF2 /* rsrc_patches.cpp in Sources */,
7539E2931F23C56F006B2DF2 /* serial_dummy.cpp in Sources */,
7539E1981F23B25A006B2DF2 /* exceptions.cpp in Sources */,
75CBCF771F5DB65E00830063 /* video_sdl.cpp in Sources */,
7539E1901F23B25A006B2DF2 /* basilisk_glue.cpp in Sources */,
7539E2801F23C4CA006B2DF2 /* main_unix.cpp in Sources */,
7539E1E11F23B25A006B2DF2 /* user_strings.cpp in Sources */,

2
BasiliskII/src/Unix/configure.ac
View File

@ -813,7 +813,7 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
fi
if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support])
VIDEOSRCS="../SDL/video_sdl.cpp"
VIDEOSRCS="../SDL/video_sdl.cpp ../SDL/video_sdl2.cpp"
KEYCODES="../SDL/keycodes"
if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
AC_MSG_CHECKING([whether __LP64__ is defined])

49
BasiliskII/src/Windows/BasiliskII.vcxproj
View File

@ -56,6 +56,7 @@
<ClCompile Include="..\scsi.cpp" />
<ClCompile Include="..\SDL\audio_sdl.cpp" />
<ClCompile Include="..\SDL\video_sdl.cpp" />
<ClCompile Include="..\SDL\video_sdl2.cpp" />
<ClCompile Include="..\serial.cpp" />
<ClCompile Include="..\slirp\bootp.c" />
<ClCompile Include="..\slirp\cksum.c" />
@ -417,9 +418,9 @@
<AdditionalDependencies>WS2_32.lib;IPHlpApi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
</Command>
</CustomBuildStep>
<CustomBuildStep>
@ -453,9 +454,9 @@
<AdditionalDependencies>WS2_32.lib;IPHlpApi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
</Command>
</CustomBuildStep>
<CustomBuildStep>
@ -486,9 +487,9 @@
<AdditionalDependencies>WS2_32.lib;IPHlpApi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
</Command>
</CustomBuildStep>
<CustomBuildStep>
@ -522,9 +523,9 @@
<AdditionalDependencies>WS2_32.lib;IPHlpApi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
</Command>
</CustomBuildStep>
<CustomBuildStep>
@ -559,9 +560,9 @@
<AdditionalDependencies>WS2_32.lib;IPHlpApi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
</Command>
</CustomBuildStep>
<CustomBuildStep>
@ -599,9 +600,9 @@
<AdditionalDependencies>WS2_32.lib;IPHlpApi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
</Command>
</CustomBuildStep>
<CustomBuildStep>
@ -636,9 +637,9 @@
<AdditionalDependencies>WS2_32.lib;IPHlpApi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
</Command>
</CustomBuildStep>
<CustomBuildStep>
@ -676,9 +677,9 @@
<AdditionalDependencies>WS2_32.lib;IPHlpApi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<CustomBuildStep>
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
<Command>cd ..\uae_cpu
"$(ToolsDir)gencpu"
"$(ToolsDir)gencomp"
</Command>
</CustomBuildStep>
<CustomBuildStep>

3
BasiliskII/src/Windows/BasiliskII.vcxproj.filters
View File

@ -270,6 +270,9 @@
<ClCompile Include="..\SDL\video_sdl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\SDL\video_sdl2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\dummy\scsi_dummy.cpp">
<Filter>Source Files</Filter>
</ClCompile>

2
BasiliskII/src/Windows/Makefile.in
View File

@ -63,7 +63,7 @@ SRCS = ../main.cpp main_windows.cpp ../prefs.cpp ../prefs_items.cpp prefs_window
../emul_op.cpp ../macos_util.cpp ../xpram.cpp xpram_windows.cpp ../timer.cpp \
timer_windows.cpp ../adb.cpp ../serial.cpp serial_windows.cpp \
../ether.cpp ether_windows.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp \
../scsi.cpp ../dummy/scsi_dummy.cpp ../video.cpp ../SDL/video_sdl.cpp \
../scsi.cpp ../dummy/scsi_dummy.cpp ../video.cpp ../SDL/video_sdl.cpp ../SDL/video_sdl2.cpp \
video_blit.cpp ../audio.cpp ../SDL/audio_sdl.cpp clip_windows.cpp \
../extfs.cpp extfs_windows.cpp ../user_strings.cpp user_strings_windows.cpp \
vm_alloc.cpp sigsegv.cpp posix_emu.cpp util_windows.cpp \

4
SheepShaver/src/MacOSX/SheepShaver.xcodeproj/project.pbxproj
View File

@ -129,6 +129,7 @@
08CD42DC14B7B85B009CA2A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */; };
08CD42E814B7B8AA009CA2A2 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08CD42E714B7B8AA009CA2A2 /* Carbon.framework */; };
08D93A16159FE174003B04EC /* clip_macosx64.mm in Sources */ = {isa = PBXBuildFile; fileRef = 08D93A15159FE174003B04EC /* clip_macosx64.mm */; };
75CBCF7B1F5DB82B00830063 /* video_sdl2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75CBCF7A1F5DB82B00830063 /* video_sdl2.cpp */; };
A7B1921418C35D4700791D8D /* DiskType.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B1921318C35D4700791D8D /* DiskType.m */; };
/* End PBXBuildFile section */
@ -450,6 +451,7 @@
08CD42DB14B7B85B009CA2A2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
08CD42E714B7B8AA009CA2A2 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
08D93A15159FE174003B04EC /* clip_macosx64.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = clip_macosx64.mm; sourceTree = "<group>"; };
75CBCF7A1F5DB82B00830063 /* video_sdl2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video_sdl2.cpp; path = ../../../BasiliskII/src/SDL/video_sdl2.cpp; sourceTree = "<group>"; };
A7B1921218C35D4700791D8D /* DiskType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskType.h; sourceTree = "<group>"; };
A7B1921318C35D4700791D8D /* DiskType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DiskType.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -845,6 +847,7 @@
0856CE9214A99EF0000B1711 /* SDLMain.h */,
0856CE9314A99EF0000B1711 /* SDLMain.m */,
0856CE9414A99EF0000B1711 /* video_sdl.cpp */,
75CBCF7A1F5DB82B00830063 /* video_sdl2.cpp */,
);
name = SDL;
path = ../SDL;
@ -1411,6 +1414,7 @@
0856D02514A99EF0000B1711 /* extfs_macosx.cpp in Sources */,
0856D05014A99EF1000B1711 /* prefs_macosx.mm in Sources */,
0856D05A14A99EF1000B1711 /* sys_darwin.cpp in Sources */,
75CBCF7B1F5DB82B00830063 /* video_sdl2.cpp in Sources */,
0856D05B14A99EF1000B1711 /* main.cpp in Sources */,
0856D05C14A99EF1000B1711 /* name_registry.cpp in Sources */,
0856D05D14A99EF1000B1711 /* prefs_items.cpp in Sources */,

4
SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj
View File

@ -104,6 +104,7 @@
08E877521E0640E800A90A2C /* clip_macosx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0856CE2C14A99EF0000B1711 /* clip_macosx.cpp */; };
7539EDF51F50C40100454E81 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7539EDE91F50C3D600454E81 /* SDL2.framework */; };
7539EDF61F50C40100454E81 /* SDL2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7539EDE91F50C3D600454E81 /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
75CBCF7E1F5DB94C00830063 /* video_sdl2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 75CBCF7D1F5DB94C00830063 /* video_sdl2.cpp */; };
A7B1921418C35D4700791D8D /* DiskType.m in Sources */ = {isa = PBXBuildFile; fileRef = A7B1921318C35D4700791D8D /* DiskType.m */; };
/* End PBXBuildFile section */
@ -409,6 +410,7 @@
08CD42E714B7B8AA009CA2A2 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
08D93A15159FE174003B04EC /* clip_macosx64.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = clip_macosx64.mm; sourceTree = "<group>"; };
7539EDE11F50C3D600454E81 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../external/SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
75CBCF7D1F5DB94C00830063 /* video_sdl2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = video_sdl2.cpp; path = ../../../BasiliskII/src/SDL/video_sdl2.cpp; sourceTree = "<group>"; };
A7B1921218C35D4700791D8D /* DiskType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskType.h; sourceTree = "<group>"; };
A7B1921318C35D4700791D8D /* DiskType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DiskType.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
@ -769,6 +771,7 @@
0856CE9014A99EF0000B1711 /* audio_sdl.cpp */,
0856CE9114A99EF0000B1711 /* keycodes */,
0856CE9414A99EF0000B1711 /* video_sdl.cpp */,
75CBCF7D1F5DB94C00830063 /* video_sdl2.cpp */,
);
name = SDL;
path = ../SDL;
@ -1174,6 +1177,7 @@
0856D00914A99EF0000B1711 /* macos_util.cpp in Sources */,
0856D02514A99EF0000B1711 /* extfs_macosx.cpp in Sources */,
0856D05014A99EF1000B1711 /* prefs_macosx.mm in Sources */,
75CBCF7E1F5DB94C00830063 /* video_sdl2.cpp in Sources */,
0856D05A14A99EF1000B1711 /* sys_darwin.cpp in Sources */,
0856D05B14A99EF1000B1711 /* main.cpp in Sources */,
0856D05C14A99EF1000B1711 /* name_registry.cpp in Sources */,

2
SheepShaver/src/Unix/configure.ac
View File

@ -705,7 +705,7 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
fi
if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; then
AC_DEFINE(USE_SDL_VIDEO, 1, [Define to enable SDL video graphics support.])
VIDEOSRCS="../SDL/video_sdl.cpp"
VIDEOSRCS="../SDL/video_sdl.cpp ../SDL/video_sdl2.cpp"
KEYCODES="../SDL/keycodes"
if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
AC_MSG_CHECKING([whether __LP64__ is defined])

2
SheepShaver/src/Windows/Makefile.in
View File

@ -65,7 +65,7 @@ SRCS = ../main.cpp main_windows.cpp ../prefs.cpp ../prefs_items.cpp prefs_window
../rom_patches.cpp ../rsrc_patches.cpp ../emul_op.cpp ../name_registry.cpp \
../macos_util.cpp ../timer.cpp timer_windows.cpp ../xpram.cpp xpram_windows.cpp \
../adb.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp ../dummy/scsi_dummy.cpp \
../gfxaccel.cpp ../video.cpp ../SDL/video_sdl.cpp video_blit.cpp \
../gfxaccel.cpp ../video.cpp ../SDL/video_sdl.cpp ../SDL/video_sdl2.cpp video_blit.cpp \
../audio.cpp ../SDL/audio_sdl.cpp ../ether.cpp ether_windows.cpp \
../thunks.cpp ../serial.cpp serial_windows.cpp ../extfs.cpp extfs_windows.cpp \
about_window_windows.cpp ../user_strings.cpp user_strings_windows.cpp \