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
@ -37,7 +41,7 @@ Changelog
* Epic missions now have limited "lives". A player can only be killed a certain number of times before they automatically fail the mission. This is to discourage reckless play. * Epic missions now have limited "lives". A player can only be killed a certain number of times before they automatically fail the mission. This is to discourage reckless play.
1.01 1.01
* Corrected "Nation of Tzac" to "Kingdom of Tzac" in a few cases * Corrected "Nation of Tzac" to "Kingdom of Tzac" in a few cases
* Fixed broken REVISION makefile macro when git is not available * Fixed broken REVISION makefile macro when git is not available
@ -69,7 +73,7 @@ Changelog
* Campaign tweaks and bugs fixes * Campaign tweaks and bugs fixes
0.95 0.95
* AI fixes * AI fixes
* Campaign tweaks and bugs fixes * Campaign tweaks and bugs fixes
* Reset entity owner when detaching tow rope * Reset entity owner when detaching tow rope
@ -87,11 +91,11 @@ Changelog
* Lowered difficulty of some missions * Lowered difficulty of some missions
0.92 0.92
* Campaign tweaks and bug fixes * Campaign tweaks and bug fixes
0.91 0.91
* New music track by Vehicle * New music track by Vehicle
* Added effects when bullets hit targets * Added effects when bullets hit targets
* Updated Mantis sprite * Updated Mantis sprite
@ -101,7 +105,7 @@ Changelog
* Misc. tweaks and fixes * Misc. tweaks and fixes
0.9 0.9
* Added final campaign missions * Added final campaign missions
* Added final challenges * Added final challenges
* Enabled all trophies * Enabled all trophies
@ -151,7 +155,7 @@ Changelog
* Misc. AI, mission, and bug fixes * Misc. AI, mission, and bug fixes
0.4 0.4
* Added mouse + keyboard controls (replaces keyboard-only method) * Added mouse + keyboard controls (replaces keyboard-only method)
* Added new craft: Kingfisher, Mantis, Rook, Hammerhead, Khepri, Scarab, Thunderhead. * Added new craft: Kingfisher, Mantis, Rook, Hammerhead, Khepri, Scarab, Thunderhead.
* Added laser cannon - highly effective against shields * Added laser cannon - highly effective against shields

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