diff --git a/JGE/Makefile b/JGE/Makefile index 16c604f48..b1c362bac 100644 --- a/JGE/Makefile +++ b/JGE/Makefile @@ -2,6 +2,10 @@ ifeq ($(MAKECMDGOALS),debug) DEBUG = true endif +ifeq ($(MAKECMDGOALS),log) +DOLOG = true +endif + GENERIC_OBJS = src/JApp.o src/JGBKFont.o \ src/JGE.o src/JGui.o src/JLBFont.o \ @@ -29,7 +33,11 @@ HGE_OBJS = src/hge/hgecolor.o src/hge/hgeparticle.o \ CXXFLAGS = -W -Wall -Werror -Wno-unused ifdef DEBUG -CXXFLAGS += -ggdb3 +CXXFLAGS += -ggdb3 -DDOJLOG +endif + +ifdef DOLOG +CXXFLAGS += -DDOJLOG endif # Determination of target. diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index 5eccf487e..8fb3ea004 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -60,12 +60,15 @@ LDFLAGS += $(LIBS) debug: CXXFLAGS += -ggdb3 -D_DEBUG -DDEBUG +log: CXXFLAGS += -DDOLOG + ifeq ($(TARGET_ARCHITECTURE),psp) include $(PSPSDK)/lib/build.mak +log: all debug: all 3xx: diff --git a/projects/mtg/src/MTGDeck.cpp b/projects/mtg/src/MTGDeck.cpp index c8f9a144c..d9bfa1c82 100644 --- a/projects/mtg/src/MTGDeck.cpp +++ b/projects/mtg/src/MTGDeck.cpp @@ -19,6 +19,7 @@ using std::string; #include #endif + static inline int getGrade(int v) { switch (v) { case 'S': case 's': return Constants::GRADE_SUPPORTED; @@ -216,7 +217,7 @@ void MTGAllCards::init(){ int MTGAllCards::load(const char * config_file, const char * set_name,int autoload){ conf_read_mode = 0; - const int set_id = set_name ? setlist.Add(set_name) : 0; + const int set_id = set_name ? setlist.Add(set_name) : -1; MTGSetInfo *si = setlist.getInfo(set_id); std::ifstream setFile(config_file);