ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/sdl3-conversion' of github.com:stella-emu/stella into feature/sdl3-conversion

This commit is contained in:
Stephen Anthony 2025-05-23 16:29:35 -02:30
parent 6bd7dedeef b35d71e10d
commit d18bde79a3
9 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -5,7 +5,7 @@ Priority: optional
Build-Depends: debhelper (>= 10~),
libgtest-dev,
libpng-dev,
libsdl2-dev,
libsdl3-dev,
zlib1g-dev
Standards-Version: 4.5.0
Vcs-Browser: https://github.com/stella-emu/stella/

2
src/common/FBBackendSDL.cxx
View File

@ -506,7 +506,7 @@ string FBBackendSDL::about() const
out << " Renderer: "
<< SDL_GetStringProperty(props, SDL_PROP_RENDERER_NAME_STRING, "")
<< '\n';
const int maxTexSize =
const uInt64 maxTexSize =
SDL_GetNumberProperty(props, SDL_PROP_RENDERER_MAX_TEXTURE_SIZE_NUMBER, 0);
if(maxTexSize > 0)
out << " Max texture: " << maxTexSize << "x" << maxTexSize << '\n';

3
src/common/MediaFactory.hxx
View File

@ -40,9 +40,6 @@
#elif defined(BSPF_MACOS)
#include "SerialPortMACOS.hxx"
#include "OSystemMACOS.hxx"
extern "C" {
int stellaMain(int argc, char* argv[]);
}
#elif defined(__LIB_RETRO__)
#include "OSystemLIBRETRO.hxx"
#else

4
src/common/main.cxx
View File

@ -187,11 +187,7 @@ void freeConsole()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#if defined(BSPF_MACOS)
int stellaMain(int ac, char* av[])
#else
int main(int ac, char* av[])
#endif
{
SET_MAIN_THREAD;

4
src/os/macos/SDLMain.h
View File

@ -1,3 +1,5 @@
#if 0
/** SDLMain.m - main entry point for our Cocoa-ized SDL app
Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
Non-NIB-Code & other changes: Max Horn <max@quendi.de>
@ -10,3 +12,5 @@
+ (SDLMain*) sharedInstance;
@end
#endif

4
src/os/macos/SDLMain.m
View File

@ -1,3 +1,5 @@
#if 0
/** SDLMain.m - main entry point for our Cocoa-ized SDL app
Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
Non-NIB-Code & other changes: Max Horn <max@quendi.de>
@ -96,3 +98,5 @@ int main (int argc, char* argv[])
return 0;
}
#endif

18
src/os/macos/stella.xcodeproj/project.pbxproj
View File

@ -193,7 +193,6 @@
2D91751009BA90380026E9FF /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DEB3D4C0629BD24007EBBD3 /* OpenGL.framework */; };
2D91751209BA90380026E9FF /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D17D98E08BC398400E47F69 /* ApplicationServices.framework */; };
2DEFB40C09C3386F00754289 /* Cart.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2DEFB40B09C3386F00754289 /* Cart.icns */; };
55FE2A321EE4856B00078ADE /* SDL2.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCDAF4D818CA9AAB00D3865D /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
55FE2A501EE4880500078ADE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 55FE2A3C1EE487CA00078ADE /* InfoPlist.strings */; };
CFB521D72853A2590083B9CE /* CartBUSInfoWidget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = CFB521D52853A2590083B9CE /* CartBUSInfoWidget.cxx */; };
CFB521D82853A2590083B9CE /* CartBUSInfoWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = CFB521D62853A2590083B9CE /* CartBUSInfoWidget.hxx */; };
@ -422,6 +421,8 @@
DC69670C1361FD0A0036499D /* pnginfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6967081361FD0A0036499D /* pnginfo.h */; };
DC69670D1361FD0A0036499D /* pnglibconf.h in Headers */ = {isa = PBXBuildFile; fileRef = DC6967091361FD0A0036499D /* pnglibconf.h */; };
DC69670E1361FD0A0036499D /* pngstruct.h in Headers */ = {isa = PBXBuildFile; fileRef = DC69670A1361FD0A0036499D /* pngstruct.h */; };
DC69A4AB2DE0D9B000017847 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC69A4AA2DE0D9B000017847 /* SDL3.framework */; };
DC69A4AC2DE0D9B000017847 /* SDL3.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = DC69A4AA2DE0D9B000017847 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DC6A18F819B3E65500DEB242 /* CartMDMWidget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC6A18F619B3E65500DEB242 /* CartMDMWidget.cxx */; };
DC6A18F919B3E65500DEB242 /* CartMDMWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC6A18F719B3E65500DEB242 /* CartMDMWidget.hxx */; };
DC6A18FC19B3E67A00DEB242 /* CartMDM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC6A18FA19B3E67A00DEB242 /* CartMDM.cxx */; };
@ -677,7 +678,6 @@
DCD6FC9411C28C6F005DA767 /* PNGLibrary.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCD6FC9211C28C6F005DA767 /* PNGLibrary.hxx */; };
DCDA03B01A2009BB00711920 /* CartWD.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCDA03AE1A2009BA00711920 /* CartWD.cxx */; };
DCDA03B11A2009BB00711920 /* CartWD.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCDA03AF1A2009BB00711920 /* CartWD.hxx */; };
DCDAF4D918CA9AAB00D3865D /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCDAF4D818CA9AAB00D3865D /* SDL2.framework */; };
DCDDEAC41F5DBF0400C67366 /* RewindManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCDDEAC01F5DBF0400C67366 /* RewindManager.cxx */; };
DCDDEAC51F5DBF0400C67366 /* RewindManager.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCDDEAC11F5DBF0400C67366 /* RewindManager.hxx */; };
DCDDEAC61F5DBF0400C67366 /* StateManager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCDDEAC21F5DBF0400C67366 /* StateManager.cxx */; };
@ -875,7 +875,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
55FE2A321EE4856B00078ADE /* SDL2.framework in CopyFiles */,
DC69A4AC2DE0D9B000017847 /* SDL3.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1304,6 +1304,7 @@
DC6967081361FD0A0036499D /* pnginfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pnginfo.h; sourceTree = "<group>"; };
DC6967091361FD0A0036499D /* pnglibconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pnglibconf.h; sourceTree = "<group>"; };
DC69670A1361FD0A0036499D /* pngstruct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pngstruct.h; sourceTree = "<group>"; };
DC69A4AA2DE0D9B000017847 /* SDL3.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL3.framework; path = ../../../../../Library/Frameworks/SDL3.framework; sourceTree = "<group>"; };
DC6A18F619B3E65500DEB242 /* CartMDMWidget.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartMDMWidget.cxx; sourceTree = "<group>"; };
DC6A18F719B3E65500DEB242 /* CartMDMWidget.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartMDMWidget.hxx; sourceTree = "<group>"; };
DC6A18FA19B3E67A00DEB242 /* CartMDM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartMDM.cxx; sourceTree = "<group>"; };
@ -1561,7 +1562,6 @@
DCD6FC9211C28C6F005DA767 /* PNGLibrary.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = PNGLibrary.hxx; sourceTree = "<group>"; };
DCDA03AE1A2009BA00711920 /* CartWD.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartWD.cxx; sourceTree = "<group>"; };
DCDA03AF1A2009BB00711920 /* CartWD.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartWD.hxx; sourceTree = "<group>"; };
DCDAF4D818CA9AAB00D3865D /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
DCDDEAC01F5DBF0400C67366 /* RewindManager.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RewindManager.cxx; sourceTree = "<group>"; };
DCDDEAC11F5DBF0400C67366 /* RewindManager.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = RewindManager.hxx; sourceTree = "<group>"; };
DCDDEAC21F5DBF0400C67366 /* StateManager.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StateManager.cxx; sourceTree = "<group>"; };
@ -1724,10 +1724,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DCDAF4D918CA9AAB00D3865D /* SDL2.framework in Frameworks */,
2D91750F09BA90380026E9FF /* Cocoa.framework in Frameworks */,
2D91751009BA90380026E9FF /* OpenGL.framework in Frameworks */,
2D91751209BA90380026E9FF /* ApplicationServices.framework in Frameworks */,
DC69A4AB2DE0D9B000017847 /* SDL3.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1813,7 +1813,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
DCDAF4D818CA9AAB00D3865D /* SDL2.framework */,
DC69A4AA2DE0D9B000017847 /* SDL3.framework */,
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
);
@ -3781,6 +3781,7 @@
.,
"$(HOME)/Library/Frameworks",
"$(LOCAL_LIBRARY_DIR)/Frameworks",
"$(USER_LIBRARY_DIR)/Frameworks",
);
GCC_DYNAMIC_NO_PIC = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@ -3801,7 +3802,6 @@
"PNG_ARM_NEON_OPT=0",
);
HEADER_SEARCH_PATHS = (
/Library/Frameworks/SDL2.framework/Headers,
../../cheat,
../../common,
../../common/tv_filters,
@ -3853,6 +3853,7 @@
.,
"$(HOME)/Library/Frameworks",
"$(LOCAL_LIBRARY_DIR)/Frameworks",
"$(USER_LIBRARY_DIR)/Frameworks",
);
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = 3;
@ -3872,7 +3873,6 @@
"PNG_ARM_NEON_OPT=0",
);
HEADER_SEARCH_PATHS = (
/Library/Frameworks/SDL2.framework/Headers,
../../cheat,
../../common,
../../common/tv_filters,
@ -3952,6 +3952,7 @@
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
"DEBUG_INFORMATION_FORMAT[sdk=*]" = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
@ -4030,6 +4031,7 @@
CLANG_WARN__EXIT_TIME_DESTRUCTORS = NO;
COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = YES;
"DEBUG_INFORMATION_FORMAT[sdk=macosx*]" = "";
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (

2
src/os/unix/stella.spec
View File

@ -19,7 +19,7 @@ License: GPL
URL: https://stella-emu.github.io
Source: %{name}-%{version}.tar.xz
BuildRoot: %_tmppath/%name-%version-%release-root
BuildRequires: SDL2-devel MesaGLU-devel
BuildRequires: SDL3-devel MesaGLU-devel
%description
The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most

6
src/os/windows/Stella.vcxproj
View File

@ -191,7 +191,7 @@
<DisableAnalyzeExternal>true</DisableAnalyzeExternal>
</ClCompile>
<Link>
<AdditionalDependencies>SDL3.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)Stella.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)Stella.pdb</ProgramDatabaseFile>
@ -229,7 +229,7 @@
<DisableAnalyzeExternal>true</DisableAnalyzeExternal>
</ClCompile>
<Link>
<AdditionalDependencies>SDL3.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>SDL3.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)Stella.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)Stella.pdb</ProgramDatabaseFile>
@ -2003,4 +2003,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>