From 1d37358b8c77a40883650396c2a1c92e41c36663 Mon Sep 17 00:00:00 2001 From: SpinDizzy Date: Fri, 4 Sep 2020 05:48:41 +0000 Subject: [PATCH] - Add missing library from previous windows makefile update. - NEW_FRAME_TIMING build option was removed because it was no longer used. --- Makefiles/Makefile.Win32 | 6 +++--- Makefiles/Options.inc | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Makefiles/Makefile.Win32 b/Makefiles/Makefile.Win32 index c6c206a..0dce4b1 100644 --- a/Makefiles/Makefile.Win32 +++ b/Makefiles/Makefile.Win32 @@ -81,10 +81,10 @@ endif # # 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 = ifeq ($(strip $(NET_BOARD)),1) - SDL2_LIBS += -lSDL2_net + SDL2_LIBS += -lSDL2_net -liphlpapi endif # @@ -93,7 +93,7 @@ endif PLATFORM_INCLUDE_DIR = $(SDL2_INCLUDE_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_LDFLAGS = -static -L$(sort $(PLATFORM_LIB_DIR)) $(SDL2_LIBS) $(PLATFORM_LIBS) diff --git a/Makefiles/Options.inc b/Makefiles/Options.inc index abf400b..f5761af 100644 --- a/Makefiles/Options.inc +++ b/Makefiles/Options.inc @@ -59,14 +59,6 @@ ifneq ($(filter $(strip $(NET_BOARD)),0 1),$(strip $(NET_BOARD))) override NET_BOARD = 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') #