Browse Source

Merge pull request #64 from nahkhiir/nahkhiir-issue44

Fix for Linux Make build process failing with undefined references
Peter Robinson 2 years ago
parent
commit
eb30377c15

+ 2 - 1
engine/compilers/Make-32bit/Torque2D.mk

@@ -2,7 +2,8 @@ APPNAME := ../../../Torque2D
 
 
 2D_SOURCES :=            $(shell find ../../source/2d/ -name "*.cc") + \
 2D_SOURCES :=            $(shell find ../../source/2d/ -name "*.cc") + \
 						 $(shell find ../../source/2d/ -name "*.cpp")
 						 $(shell find ../../source/2d/ -name "*.cpp")
-ALGORITHM_SOURCES :=     $(shell find ../../source/algorithm/ -name "*.cc")
+ALGORITHM_SOURCES :=     $(shell find ../../source/algorithm/ -name "*.cc") + \
+                         $(shell find ../../source/algorithm/ -name "*.c")
 ASSETS_SOURCES :=        $(shell find ../../source/assets/ -name "*.cc")
 ASSETS_SOURCES :=        $(shell find ../../source/assets/ -name "*.cc")
 AUDIO_SOURCES :=         $(shell find ../../source/audio/ -name "*.cc")
 AUDIO_SOURCES :=         $(shell find ../../source/audio/ -name "*.cc")
 BITMAPFONT_SOURCES :=    $(shell find ../../source/bitmapFont/ -name "*.cc")
 BITMAPFONT_SOURCES :=    $(shell find ../../source/bitmapFont/ -name "*.cc")

+ 3 - 2
engine/compilers/Make-64bit/Torque2D.mk

@@ -2,7 +2,8 @@ APPNAME := ../../../Torque2D
 
 
 2D_SOURCES :=            $(shell find ../../source/2d/ -name "*.cc") + \
 2D_SOURCES :=            $(shell find ../../source/2d/ -name "*.cc") + \
 						 $(shell find ../../source/2d/ -name "*.cpp")
 						 $(shell find ../../source/2d/ -name "*.cpp")
-ALGORITHM_SOURCES :=     $(shell find ../../source/algorithm/ -name "*.cc")
+ALGORITHM_SOURCES :=     $(shell find ../../source/algorithm/ -name "*.cc") + \
+                         $(shell find ../../source/algorithm/ -name "*.c")
 ASSETS_SOURCES :=        $(shell find ../../source/assets/ -name "*.cc")
 ASSETS_SOURCES :=        $(shell find ../../source/assets/ -name "*.cc")
 AUDIO_SOURCES :=         $(shell find ../../source/audio/ -name "*.cc")
 AUDIO_SOURCES :=         $(shell find ../../source/audio/ -name "*.cc")
 BITMAPFONT_SOURCES :=    $(shell find ../../source/bitmapFont/ -name "*.cc")
 BITMAPFONT_SOURCES :=    $(shell find ../../source/bitmapFont/ -name "*.cc")
@@ -63,7 +64,7 @@ SOURCES := $(2D_SOURCES) + \
 LDFLAGS := -g -m64
 LDFLAGS := -g -m64
 LDLIBS := -lstdc++ -lm -ldl -lpthread -lrt -lX11 -lXft -lSDL -lopenal
 LDLIBS := -lstdc++ -lm -ldl -lpthread -lrt -lX11 -lXft -lSDL -lopenal
 
 
-CFLAGS := -std=c++14 -MMD -I. -Wfatal-errors -Wunused -m64 -msse -march=x86-64 -pipe
+CFLAGS := -std=c++17 -MMD -I. -Wfatal-errors -Wunused -m64 -msse -march=x86-64 -pipe
 
 
 CFLAGS += -I/usr/include
 CFLAGS += -I/usr/include
 CFLAGS += -I/usr/include/freetype2
 CFLAGS += -I/usr/include/freetype2