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

- Add missing library from previous windows makefile update.

Browse source 
- NEW_FRAME_TIMING build option was removed because it was no longer used.
This commit is contained in:
SpinDizzy 2020-09-04 05:48:41 +00:00
parent 95488acb0a
commit 1d37358b8c
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefiles/Makefile.Win32
View file

@ -81,10 +81,10 @@ endif
# #
# SDL2 # SDL2
# #
SDL2_LIBS = -lmingw32 -lSDL2main -lSDL2 -Wl,--no-undefined -ldxerr8 -ldinput8 -lshell32 -lsetupapi -ladvapi32 -luuid -lversion -loleaut32 -lole32 -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 =
ifeq ($(strip $(NET_BOARD)),1) ifeq ($(strip $(NET_BOARD)),1)
SDL2_LIBS += -lSDL2_net SDL2_LIBS += -lSDL2_net -liphlpapi
endif endif
# #
@ -93,7 +93,7 @@ endif
PLATFORM_INCLUDE_DIR = $(SDL2_INCLUDE_DIR) PLATFORM_INCLUDE_DIR = $(SDL2_INCLUDE_DIR)
PLATFORM_LIB_DIR = $(SDL2_LIB_DIR) PLATFORM_LIB_DIR = $(SDL2_LIB_DIR)
PLATFORM_LIBS = -ldinput8 -lglu32 -lole32 -loleaut32 -lopengl32 -lwbemuuid -lws2_32 -lz PLATFORM_LIBS = -ldxerr8 -ldinput8 -lglu32 -lole32 -loleaut32 -lopengl32 -lwbemuuid -lws2_32 -lz
PLATFORM_CFLAGS = $(SDL2_CFLAGS) -DSUPERMODEL_WIN32 $(addprefix -I,$(sort $(PLATFORM_INCLUDE_DIR))) -O2 PLATFORM_CFLAGS = $(SDL2_CFLAGS) -DSUPERMODEL_WIN32 $(addprefix -I,$(sort $(PLATFORM_INCLUDE_DIR))) -O2
PLATFORM_LDFLAGS = -static -L$(sort $(PLATFORM_LIB_DIR)) $(SDL2_LIBS) $(PLATFORM_LIBS) PLATFORM_LDFLAGS = -static -L$(sort $(PLATFORM_LIB_DIR)) $(SDL2_LIBS) $(PLATFORM_LIBS)

8
Makefiles/Options.inc
View file

@ -59,14 +59,6 @@ ifneq ($(filter $(strip $(NET_BOARD)),0 1),$(strip $(NET_BOARD)))
override NET_BOARD = override NET_BOARD =
endif endif
#
# Enable Bart's new (experimental) Real3D frame timing
#
NEW_FRAME_TIMING =
ifneq ($(filter $(strip $(NEW_FRAME_TIMING)),0 1),$(strip $(NEW_FRAME_TIMING)))
override NEW_FRAME_TIMING =
endif
# #
# Include console-based debugger in emulator ('yes' or 'no') # Include console-based debugger in emulator ('yes' or 'no')
# #