shithub: cstory

Download patch

ref: 023188a1b31447e9f9ed81df1ce16cb504f165c5
parent: 46c59b93896f02b6afb0d5d18335d97c56cfdb5e
author: Clownacy <Clownacy@users.noreply.github.com>
date: Mon Sep 2 11:37:11 EDT 2019

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.

--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
 	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 @@
 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 @@
 
 obj/$(FILENAME)/resources.o: msvc2003/CSE2.rc
 	@mkdir -p $(@D)
-	@windres $< $@
+	@$(WINDRES) $< $@
 
 $(BUILD_DIRECTORY)/$(DOCONFIG_FILENAME): DoConfig/DoConfig.cpp
 	@mkdir -p $(@D)