Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
- fix for issue 390 (tokens available in shop)
- added "log" features in makefile
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-06-12 06:06:27 +00:00
parent b25cd5d041
commit d756005093
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/Makefile
+9 -1
View File
@@ -2,6 +2,10 @@ ifeq ($(MAKECMDGOALS),debug)
DEBUG = true DEBUG = true
endif endif
ifeq ($(MAKECMDGOALS),log)
DOLOG = true
endif
GENERIC_OBJS = src/JApp.o src/JGBKFont.o \ GENERIC_OBJS = src/JApp.o src/JGBKFont.o \
src/JGE.o src/JGui.o src/JLBFont.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 CXXFLAGS = -W -Wall -Werror -Wno-unused
ifdef DEBUG ifdef DEBUG
CXXFLAGS += -ggdb3 CXXFLAGS += -ggdb3 -DDOJLOG
endif
ifdef DOLOG
CXXFLAGS += -DDOJLOG
endif endif
# Determination of target. # Determination of target.
projects/mtg/Makefile
+3
View File
@@ -60,12 +60,15 @@ LDFLAGS += $(LIBS)
debug: CXXFLAGS += -ggdb3 -D_DEBUG -DDEBUG debug: CXXFLAGS += -ggdb3 -D_DEBUG -DDEBUG
log: CXXFLAGS += -DDOLOG
ifeq ($(TARGET_ARCHITECTURE),psp) ifeq ($(TARGET_ARCHITECTURE),psp)
include $(PSPSDK)/lib/build.mak include $(PSPSDK)/lib/build.mak
log: all
debug: all debug: all
3xx: 3xx:
projects/mtg/src/MTGDeck.cpp
+2 -1
View File
@@ -19,6 +19,7 @@ using std::string;
#include <time.h> #include <time.h>
#endif #endif
static inline int getGrade(int v) { static inline int getGrade(int v) {
switch (v) { switch (v) {
case 'S': case 's': return Constants::GRADE_SUPPORTED; 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){ int MTGAllCards::load(const char * config_file, const char * set_name,int autoload){
conf_read_mode = 0; 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); MTGSetInfo *si = setlist.getInfo(set_id);
std::ifstream setFile(config_file); std::ifstream setFile(config_file);