Define _DEBUG for debug builds and fixed gcc compilation error.
This commit is contained in:
parent
b32eb7f0a0
commit
af20ec0847
4
Makefile
4
Makefile
@ -9,8 +9,8 @@ INCPATH = -I"tinkerbell/src" -I"Demo" -I"Demo/freeglut" -I"."
|
||||
CFLAGS = -DNDEBUG -fno-rtti -fno-exceptions -O2 $(INCPATH)
|
||||
CXXFLAGS = -DNDEBUG -fno-rtti -fno-exceptions -O2 --std=c++0x $(INCPATH)
|
||||
#debug
|
||||
#CFLAGS = -g $(INCPATH)
|
||||
#CXXFLAGS = -g --std=c++0x $(INCPATH)
|
||||
#CFLAGS = -D_DEBUG -g $(INCPATH)
|
||||
#CXXFLAGS = -D_DEBUG -g --std=c++0x $(INCPATH)
|
||||
|
||||
ifeq ($(UNAME),Darwin)
|
||||
CFLAGS += -DMACOSX -Dnullptr=0
|
||||
|
@ -48,7 +48,7 @@ const char *TBLanguage::GetString(const TBID &id)
|
||||
return *str;
|
||||
#ifdef _DEBUG
|
||||
static TBStr tmp;
|
||||
tmp.SetFormatted("<TRANSLATE:%s>", id.debug_string);
|
||||
tmp.SetFormatted("<TRANSLATE:%s>", id.debug_string.CStr());
|
||||
return tmp;
|
||||
#else
|
||||
return "<TRANSLATE!>";
|
||||
|
Loading…
Reference in New Issue
Block a user