commit fc364232

sago007 · 2014-09-05 16:38
fc36423262e1de9219a29306df5fef9c9f0ce7ed patch · browse files
parent 86cd12d5259057cf4f080a792a0d55ca998b022c

Changes to Makefile and a const reference

Changed files

M	source/code/Makefile before
M	source/code/main.cpp before

diff --git a/source/code/Makefile b/source/code/Makefile index dc40544..7898750 100644 --- a/source/code/Makefile +++ b/source/code/Makefile

@@ -50,7 +50,7 @@ $(BINARY): $(OFILES)

#-lphysfs

%.o : %.cpp

- g++ -MD $(BASE_CFLAGS) -c -o $@ $<

+ $(CPP) -MD $(BASE_CFLAGS) -c -o $@ $<

@cp $*.d $*.P; \

sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \

-e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \

diff --git a/source/code/main.cpp b/source/code/main.cpp index cd8054b..11ae79d 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -213,7 +213,7 @@ static int InitImages();

static string oldThemePath = "default";

static bool loaded = false;

-void loadTheme(string themeName)

+void loadTheme(const string &themeName)

{

if(loaded)

UnloadImages();