Merge pull request #2357 from Starbuck5/remove-sdlmain

Remove sdlmain_osx.m
pygame-community · Aug 3, 2023 · 4472ac6 · 4472ac6
2 parents b8f89f6 + e7c4743
commit 4472ac6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 217 deletions.
diff --git a/buildconfig/Setup_Darwin.in b/buildconfig/Setup_Darwin.in
@@ -1,5 +1,4 @@
 #This file defines platform specific modules for mac os x
 SCRAP =
 scrap src_c/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-sdlmain_osx src_c/sdlmain_osx.m $(SDL) $(DEBUG)
 _camera src_c/_camera.c $(SDL) $(DEBUG)
diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py
@@ -134,9 +134,7 @@ def main(auto_config=False):
         Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
         Dependency('PORTMIDI', 'portmidi.h', 'libportmidi', ['portmidi']),
         Dependency('PORTTIME', 'porttime.h', '', []),
-        find_freetype(),
-        # Scrap is included in sdlmain_osx, there is nothing to look at.
-        # Dependency('SCRAP', '','',[]),
+        find_freetype()
     ])
 
     print('Hunting dependencies...')

diff --git a/src_c/sdlmain_osx.m b/src_c/sdlmain_osx.m