Skip to content

Commit b7bb9e6

Browse files
chunkypixelchunkypixel
committed
Updated Stella to v7
1 parent d107e06 commit b7bb9e6

63 files changed

Lines changed: 701 additions & 620 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The following enhancements and changes have been made to Atari Dev Studio:
44

5+
## 0.10.5
6+
7+
* Update Stella to the latest version (v7.0).
8+
9+
Note: Stella emulation in Atari Dev Studio is now fully 64-bit only. If you wish to use an older 32-bit version, configure a custom path in the Settings instead (Emulator › Stella: Path).
10+
511
## 0.10.4
612

713
* Updated the Sprite Editor with the following changes:

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,13 @@ dasm is an external project and can be downloaded separately [here](https://dasm
157157
## Emulation
158158
Atari Dev Studio includes the following emulators for testing purposes:
159159

160-
### Stella (release 6.7.1 - 20240116)
160+
### Stella (release 7.0 - 20241006)
161161
Stella is a multi-platform Atari 2600 VCS emulator released under the GNU General Public License (GPL). Stella was originally developed for Linux by Bradford W. Mott, and is currently maintained by Stephen Anthony. Since its original release several people have joined the development team to port Stella to other operating systems such as AcornOS, AmigaOS, DOS, FreeBSD, IRIX, Linux, OS/2, MacOS, Unix, and Windows. The development team is working hard to perfect the emulator and we hope you enjoy our effort.
162162

163163
Stella is included as part of this extension with many thanks to Stephen Anthony. Stella is an external project and can be downloaded separately [here](https://stella-emu.github.io). If you enjoy using Stella place consider [donating](https://stella-emu.github.io/donations.html) to ensure it's continued development.
164164

165+
> Note: Stella emulation in Atari Dev Studio is now fully 64-bit only. If you wish to use an older 32-bit version, configure a custom path in the Settings instead (Emulator › Stella: Path).
166+
165167
### A7800 (release 5.2 - 20220626)
166168
A7800 is a fork of the MAME Atari 7800 driver, with several enhancements added:
167169
* Support for emulation of Proline Joysticks, VCS Joysticks, Lightguns, Paddles, Driving Controllers, Keypads, Trak-Balls, Amiga Mice, and ST Mice.

‎out/bin/emulators/stella/darwin/Stella.app/Contents/Frameworks/SDL2.framework/Resources/CMake/sdl2-config.cmake‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,15 @@ endmacro()
3131

3232
set(SDL2_FOUND TRUE)
3333

34-
string(REGEX REPLACE "SDL2\\.framework.*" "SDL2.framework" SDL2_FRAMEWORK_PATH "${CMAKE_CURRENT_LIST_DIR}")
35-
string(REGEX REPLACE "SDL2\\.framework.*" "" SDL2_FRAMEWORK_PARENT_PATH "${CMAKE_CURRENT_LIST_DIR}")
34+
# Compute the installation prefix relative to this file.
35+
set(SDL2_FRAMEWORK_PATH "${CMAKE_CURRENT_LIST_DIR}") # > /SDL2.framework/Resources/CMake/
36+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" REALPATH) # > /SDL2.framework/Versions/Current/Resources/CMake
37+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" REALPATH) # > /SDL2.framework/Versions/A/Resources/CMake/
38+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /SDL2.framework/Versions/A/Resources/
39+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /SDL2.framework/Versions/A/
40+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /SDL2.framework/Versions/
41+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /SDL2.framework/
42+
get_filename_component(SDL2_FRAMEWORK_PARENT_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /
3643

3744
# For compatibility with autotools sdl2-config.cmake, provide SDL2_* variables.
3845

@@ -49,12 +56,12 @@ set(SDL2_LIBRARIES "SDL2::SDL2")
4956
# This is done for compatibility with CMake generated SDL2-target.cmake files.
5057

5158
if(NOT TARGET SDL2::SDL2)
52-
add_library(SDL2::SDL2 INTERFACE IMPORTED)
59+
add_library(SDL2::SDL2 SHARED IMPORTED)
5360
set_target_properties(SDL2::SDL2
5461
PROPERTIES
55-
INTERFACE_COMPILE_OPTIONS "SHELL:-F \"${SDL2_FRAMEWORK_PARENT_PATH}\""
62+
FRAMEWORK "TRUE"
63+
IMPORTED_LOCATION "${SDL2_FRAMEWORK_PATH}/Versions/A/SDL2"
5664
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
57-
INTERFACE_LINK_OPTIONS "SHELL:-F \"${SDL2_FRAMEWORK_PARENT_PATH}\";SHELL:-framework SDL2"
5865
COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED"
5966
INTERFACE_SDL2_SHARED "ON"
6067
COMPATIBLE_INTERFACE_STRING "SDL_VERSION"

‎out/bin/emulators/stella/darwin/Stella.app/Contents/Frameworks/SDL2.framework/Resources/Info.plist‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>BuildMachineOSBuild</key>
6-
<string>22F82</string>
6+
<string>23G93</string>
77
<key>CFBundleDevelopmentRegion</key>
88
<string>English</string>
99
<key>CFBundleExecutable</key>
@@ -19,31 +19,31 @@
1919
<key>CFBundlePackageType</key>
2020
<string>FMWK</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.28.5</string>
22+
<string>2.30.8</string>
2323
<key>CFBundleSignature</key>
2424
<string>SDLX</string>
2525
<key>CFBundleSupportedPlatforms</key>
2626
<array>
2727
<string>MacOSX</string>
2828
</array>
2929
<key>CFBundleVersion</key>
30-
<string>2.28.5</string>
30+
<string>2.30.8</string>
3131
<key>DTCompiler</key>
3232
<string>com.apple.compilers.llvm.clang.1_0</string>
3333
<key>DTPlatformBuild</key>
3434
<string></string>
3535
<key>DTPlatformName</key>
3636
<string>macosx</string>
3737
<key>DTPlatformVersion</key>
38-
<string>13.3</string>
38+
<string>14.5</string>
3939
<key>DTSDKBuild</key>
40-
<string>22E245</string>
40+
<string>23F73</string>
4141
<key>DTSDKName</key>
42-
<string>macosx13.3</string>
42+
<string>macosx14.5</string>
4343
<key>DTXcode</key>
44-
<string>1431</string>
44+
<string>1540</string>
4545
<key>DTXcodeBuild</key>
46-
<string>14E300c</string>
46+
<string>15F31d</string>
4747
<key>LSMinimumSystemVersion</key>
4848
<string>10.11</string>
4949
</dict>

‎out/bin/emulators/stella/darwin/Stella.app/Contents/Frameworks/SDL2.framework/Resources/License.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Simple DirectMedia Layer
3-
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
3+
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
44

55
This software is provided 'as-is', without any express or implied
66
warranty. In no event will the authors be held liable for any damages

‎out/bin/emulators/stella/darwin/Stella.app/Contents/Frameworks/SDL2.framework/Resources/default.metallib‎

1.09 KB
Binary file not shown.

‎out/bin/emulators/stella/darwin/Stella.app/Contents/Frameworks/SDL2.framework/SDL2‎

17.4 KB
Binary file not shown.

‎out/bin/emulators/stella/darwin/Stella.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/CMake/sdl2-config.cmake‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,15 @@ endmacro()
3131

3232
set(SDL2_FOUND TRUE)
3333

34-
string(REGEX REPLACE "SDL2\\.framework.*" "SDL2.framework" SDL2_FRAMEWORK_PATH "${CMAKE_CURRENT_LIST_DIR}")
35-
string(REGEX REPLACE "SDL2\\.framework.*" "" SDL2_FRAMEWORK_PARENT_PATH "${CMAKE_CURRENT_LIST_DIR}")
34+
# Compute the installation prefix relative to this file.
35+
set(SDL2_FRAMEWORK_PATH "${CMAKE_CURRENT_LIST_DIR}") # > /SDL2.framework/Resources/CMake/
36+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" REALPATH) # > /SDL2.framework/Versions/Current/Resources/CMake
37+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" REALPATH) # > /SDL2.framework/Versions/A/Resources/CMake/
38+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /SDL2.framework/Versions/A/Resources/
39+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /SDL2.framework/Versions/A/
40+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /SDL2.framework/Versions/
41+
get_filename_component(SDL2_FRAMEWORK_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /SDL2.framework/
42+
get_filename_component(SDL2_FRAMEWORK_PARENT_PATH "${SDL2_FRAMEWORK_PATH}" PATH) # > /
3643

3744
# For compatibility with autotools sdl2-config.cmake, provide SDL2_* variables.
3845

@@ -49,12 +56,12 @@ set(SDL2_LIBRARIES "SDL2::SDL2")
4956
# This is done for compatibility with CMake generated SDL2-target.cmake files.
5057

5158
if(NOT TARGET SDL2::SDL2)
52-
add_library(SDL2::SDL2 INTERFACE IMPORTED)
59+
add_library(SDL2::SDL2 SHARED IMPORTED)
5360
set_target_properties(SDL2::SDL2
5461
PROPERTIES
55-
INTERFACE_COMPILE_OPTIONS "SHELL:-F \"${SDL2_FRAMEWORK_PARENT_PATH}\""
62+
FRAMEWORK "TRUE"
63+
IMPORTED_LOCATION "${SDL2_FRAMEWORK_PATH}/Versions/A/SDL2"
5664
INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
57-
INTERFACE_LINK_OPTIONS "SHELL:-F \"${SDL2_FRAMEWORK_PARENT_PATH}\";SHELL:-framework SDL2"
5865
COMPATIBLE_INTERFACE_BOOL "SDL2_SHARED"
5966
INTERFACE_SDL2_SHARED "ON"
6067
COMPATIBLE_INTERFACE_STRING "SDL_VERSION"

‎out/bin/emulators/stella/darwin/Stella.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/Info.plist‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>BuildMachineOSBuild</key>
6-
<string>22F82</string>
6+
<string>23G93</string>
77
<key>CFBundleDevelopmentRegion</key>
88
<string>English</string>
99
<key>CFBundleExecutable</key>
@@ -19,31 +19,31 @@
1919
<key>CFBundlePackageType</key>
2020
<string>FMWK</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>2.28.5</string>
22+
<string>2.30.8</string>
2323
<key>CFBundleSignature</key>
2424
<string>SDLX</string>
2525
<key>CFBundleSupportedPlatforms</key>
2626
<array>
2727
<string>MacOSX</string>
2828
</array>
2929
<key>CFBundleVersion</key>
30-
<string>2.28.5</string>
30+
<string>2.30.8</string>
3131
<key>DTCompiler</key>
3232
<string>com.apple.compilers.llvm.clang.1_0</string>
3333
<key>DTPlatformBuild</key>
3434
<string></string>
3535
<key>DTPlatformName</key>
3636
<string>macosx</string>
3737
<key>DTPlatformVersion</key>
38-
<string>13.3</string>
38+
<string>14.5</string>
3939
<key>DTSDKBuild</key>
40-
<string>22E245</string>
40+
<string>23F73</string>
4141
<key>DTSDKName</key>
42-
<string>macosx13.3</string>
42+
<string>macosx14.5</string>
4343
<key>DTXcode</key>
44-
<string>1431</string>
44+
<string>1540</string>
4545
<key>DTXcodeBuild</key>
46-
<string>14E300c</string>
46+
<string>15F31d</string>
4747
<key>LSMinimumSystemVersion</key>
4848
<string>10.11</string>
4949
</dict>

‎out/bin/emulators/stella/darwin/Stella.app/Contents/Frameworks/SDL2.framework/Versions/A/Resources/License.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Simple DirectMedia Layer
3-
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
3+
Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
44

55
This software is provided 'as-is', without any express or implied
66
warranty. In no event will the authors be held liable for any damages

0 commit comments

Comments
 (0)