don't link prebuilt sdl

downplay · Mar 4, 2025 · b4b2d12 · b4b2d12
1 parent 2970003
commit b4b2d12
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
@@ -333,9 +333,11 @@ all: greet check-fonts $(GAME) docs webserver
 
 # XX these are set wrong on mac cross-compiling
 LIBPCRE := contrib/install/$(ARCH)/lib/libpcre.a
-LIBSDL2 := contrib/install/$(ARCH)/lib/libSDL2.a
+LIBSDL2 :=
+# LIBSDL2 := contrib/install/$(ARCH)/lib/libSDL2.a
 LIBPNG := contrib/install/$(ARCH)/lib/libpng.a
-LIBSDL2IMAGE := contrib/install/$(ARCH)/lib/libSDL2_image.a
+LIBSDL2IMAGE :=
+# LIBSDL2IMAGE := contrib/install/$(ARCH)/lib/libSDL2_image.a
 LIBSDL2MIXER := contrib/install/$(ARCH)/lib/libSDL2_mixer.a
 LIBFREETYPE := contrib/install/$(ARCH)/lib/libfreetype.a
 LIBSQLITE := contrib/install/$(ARCH)/lib/libsqlite3.a
@@ -523,8 +525,8 @@ GCC := $(FORCE_CC)
 HOSTCC := $(FORCE_CC)
 export HOSTCC
 else
-GCC := emcc -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_FREETYPE=1 -sUSE_SDL_IMAGE=2
-# GCC := emcc -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_SDL_MIXER=2 -sUSE_FREETYPE=1
+# GCC := emcc -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_FREETYPE=1 -sUSE_SDL_IMAGE=2
+GCC := emcc -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
 # GCC := $(LMACH)$(GCC_VER_PREFIX)emcc$(GCC_VER_SUFFIX)
 endif
 
@@ -533,8 +535,8 @@ GXX := $(FORCE_CXX)
 HOSTCXX := $(FORCE_CXX)
 export HOSTCXX
 else
-GXX := em++ -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_FREETYPE=1 -sUSE_SDL_IMAGE=2
-# GXX := em++ -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1 -sUSE_SDL_MIXER=2
+# GXX := em++ -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_FREETYPE=1 -sUSE_SDL_IMAGE=2
+GXX := em++ -pthread -sSHARED_MEMORY -sWASM_WORKERS=1 -sUSE_ZLIB=1 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2 -sUSE_FREETYPE=1
 # GXX := $(LMACH)$(GCC_VER_PREFIX)em++$(GCC_VER_SUFFIX)
 endif
 
@@ -741,8 +743,8 @@ DEFINES_L += -DUSE_TILE_LOCAL
 
 ifdef BUILD_SDL2
 INCLUDES_L += -isystem contrib/install/$(ARCH)/include/SDL2
-else
-EXTRA_LIBS += contrib/sdl2/build/libSDL2.a
+# else
+# EXTRA_LIBS += contrib/sdl2/build/libSDL2.a
 endif
 ifdef BUILD_FREETYPE
 INCLUDES_L += -isystem contrib/install/$(ARCH)/include/freetype2