From 023188a1b31447e9f9ed81df1ce16cb504f165c5 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Mon, 2 Sep 2019 15:37:11 +0000 Subject: [PATCH] Makefile fixes I really need to test thing before I commit them. The library linkage things are because MinGW-w64 on Linux is case-sensitive. Unfortunately, Linux windres seems to have a problem with Windows-style directory separators, so if you try building on Linux, you'll have to convert CSE2.rc to use forward-slashes. I'd make a commit that does this, but I'm pretty sure MSVC2003 will just revert it automatically. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 28586f09..02e68ab8 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ifeq ($(RELEASE), 1) FILENAME_DEF = CSE2 DOCONFIG_FILENAME_DEF = DoConfig else - CXXFLAGS = -Og -gdb3 + CXXFLAGS = -Og -ggdb3 FILENAME_DEF = CSE2_debug DOCONFIG_FILENAME_DEF = DoConfig_debug endif @@ -41,7 +41,7 @@ ifeq ($(DEBUG_SAVE), 1) endif CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d -DWINDOWS -DNONPORTABLE -LIBS += -lkernel32 -lgdi32 -lddraw -ldinput -ldsound -lVersion -lShLwApi -lImm32 -lWinMM -ldxguid +LIBS += -lkernel32 -lgdi32 -lddraw -ldinput -ldsound -lversion -lshlwapi -limm32 -lwinmm -ldxguid ifeq ($(STATIC), 1) LDFLAGS += -static @@ -145,7 +145,7 @@ include $(wildcard $(DEPENDENCIES)) obj/$(FILENAME)/resources.o: msvc2003/CSE2.rc @mkdir -p $(@D) - @windres $< $@ + @$(WINDRES) $< $@ $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME): DoConfig/DoConfig.cpp @mkdir -p $(@D)