Skip to content
This repository was archived by the owner on Mar 5, 2023. It is now read-only.

Commit 71dc158

Browse files
committed
Cleaned up sdl android main file hacks;
1 parent 624e091 commit 71dc158

File tree

3 files changed

+0
-109
lines changed

3 files changed

+0
-109
lines changed

build.py

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ def buildSDL():
8888
callBuild("ext/SDL2/SDL2-ttf", "", "SDL2_ttf", "", False)
8989
import move_sdl_includes
9090
move_sdl_includes.moveSDLIncludes()
91-
move_sdl_includes.overwriteMainSDLFile()
9291

9392
def buildFFMPEG():
9493
subprocess.call(["bash", vcmiconf.pathProjRootBash + "/ext/ff/all.sh", vcmiconf.ndkRootBash, pathExtOutputForBash])

ext/SDL2/core/SDL_android_main.cpp

-98
This file was deleted.

move_sdl_includes.py

-10
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,3 @@ def moveSDLIncludes():
1515
flatCopyWithExt("./ext/SDL2/SDL2-image/code/", "./ext/SDL2/SDL2-image/include/", ".h")
1616
flatCopyWithExt("./ext/SDL2/SDL2-mixer/code/", "./ext/SDL2/SDL2-mixer/include/", ".h")
1717
flatCopyWithExt("./ext/SDL2/SDL2-ttf/code/", "./ext/SDL2/SDL2-ttf/include/", ".h")
18-
19-
#this is rather bad, because SDL_android_main ideally should be in repo, but it's tangled in the SDL sources and probably can't be moved somewhere else
20-
def overwriteMainSDLFile():
21-
mainDst = "./ext/SDL2/core/code/src/main/android/SDL_android_main.cpp"
22-
if not os.path.isfile(mainDst): # don't overwrite
23-
shutil.copy2("./ext/SDL2/core/SDL_android_main.cpp", mainDst)
24-
try:
25-
os.remove("./ext/SDL2/core/code/src/main/android/SDL_android_main.c")
26-
except FileNotFoundError:
27-
print("Built-in SDL_android_main.c already deleted, ignoring")

0 commit comments

Comments
 (0)