Compile fixes.

This commit is contained in:
Steve 2019-10-22 18:48:11 +01:00
parent 85507506f9
commit f7d1d3dadb
2 changed files with 14 additions and 6 deletions

View File

@ -1,5 +1,9 @@
Changelog Changelog
1.5.1
* Updated Catalan translation (thanks, oriolhub)
* Misc bug and compile fixes.
1.5 1.5
* Game now renders at chosen resolution instead of scaling up from 1280 x 720 * Game now renders at chosen resolution instead of scaling up from 1280 x 720

View File

@ -7,8 +7,12 @@ LOCALE_DIR = locale
SEARCHPATH += src/plat/win32 SEARCHPATH += src/plat/win32
_OBJS += win32Init.o _OBJS += win32Init.o
NPROCS = $(shell grep -c 'processor' /proc/cpuinfo)
MAKEFLAGS += -j$(NPROCS)
CXXFLAGS += `$(SDLC) --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DDATA_DIR=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" CXXFLAGS += `$(SDLC) --cflags` -DVERSION=$(VERSION) -DREVISION=$(REVISION) -DDATA_DIR=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\"
CXXFLAGS += -ansi CXXFLAGS += -ansi
CXXFLAGS += -m32
LDFLAGS += `$(SDLC) --libs` -lm -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lSDL2main LDFLAGS += `$(SDLC) --libs` -lm -lSDL2_mixer -lSDL2_image -lSDL2_ttf -lSDL2main