Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-21 13:25:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Makefile.Win32: Fixed SDL2 flags when building in MSYS

Browse source
This commit is contained in:
Bart Trzynadlowski 2024-08-09 22:30:50 -07:00
parent a0341cd1a4
commit 6bae80bdf9
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Makefiles/Makefile.Win32
View file

@ -83,15 +83,16 @@ endif
# SDL2 # SDL2
# #
ifneq (,$(findstring cmd.exe,$(shell echo %COMSPEC%))) ifneq (,$(findstring cmd.exe,$(shell echo %COMSPEC%)))
# When building in Command Prompt, we don't have sdl2-config and must hard-code the SDL2 include # When building in Command Prompt, we don't have sdl2-config and must hard-code the SDL2 include
# and library directories # and library directories
SDL2_INCLUDE_DIR = \msys64\mingw64\include\SDL2 SDL2_INCLUDE_DIR = \msys64\mingw64\include\SDL2
SDL2_LIB_DIR = \msys64\mingw64\lib SDL2_LIB_DIR = \msys64\mingw64\lib
SDL2_LIBS = -lmingw32 -lSDL2main -lSDL2 -Wl,--no-undefined -lshell32 -lsetupapi -ladvapi32 -luuid -lversion -limm32 -lwinmm -lgdi32 -luser32 -lm -pipe SDL2_LIBS = -lmingw32 -lSDL2main -lSDL2 -Wl,--no-undefined -lshell32 -lsetupapi -ladvapi32 -luuid -lversion -limm32 -lwinmm -lgdi32 -luser32 -lm -pipe
SDL2_CFLAGS = SDL2_CFLAGS =
else else
SDL2_LIBS = `sdl2-config --static-libs` # Must strip out -mwindows so we don't create a GUI app (will not work in Command Prompt)
SDL2_CFLAGS = `sdl2-config --cflags | sed 's/-Dmain=SDL_main//'` SDL2_LIBS = $(shell sdl2-config --static-libs | sed 's/-mwindows//g')
SDL2_CFLAGS = $(shell sdl2-config --cflags)
endif endif
ifeq ($(strip $(NET_BOARD)),1) ifeq ($(strip $(NET_BOARD)),1)
SDL2_LIBS += -lSDL2_net -liphlpapi SDL2_LIBS += -lSDL2_net -liphlpapi
@ -134,4 +135,4 @@ clean:
$(OBJ_DIR)/SupermodelResources.o: Src/OSD/Windows/SupermodelResources.rc Src/OSD/Windows/SupermodelManifest.xml | $(OBJ_DIR) $(OBJ_DIR)/SupermodelResources.o: Src/OSD/Windows/SupermodelResources.rc Src/OSD/Windows/SupermodelManifest.xml | $(OBJ_DIR)
$(info Compiling : $< -> $@) $(info Compiling : $< -> $@)
$(SILENT)windres -i Src/OSD/Windows/SupermodelResources.rc -o $@ $(SILENT)windres -i Src/OSD/Windows/SupermodelResources.rc -o $@