非 unicode build 対応

git-svn-id: svn+ssh://svn.osdn.net/svnroot/unagi@384 24ea1065-a21e-4ca1-99c9-f5125deb0858

diff --git a/client/trunk/anago/anago.mk b/client/trunk/anago/anago.mk
index 61346a1..8c9dd1f 100644 (file)
--- a/client/trunk/anago/anago.mk
+++ b/client/trunk/anago/anago.mk
@@ -3,7 +3,7 @@ VPATH = ..
 ifeq ($(RELEASE),1)
   CPPFLAGS += -O2 -DNDEBUG
 else
-  CPPFLAGS += -g -O0
+  CPPFLAGS += -ggdb -O0
 endif
 CPPFLAGS += -Wall -Werror -DDEBUG=1
 CFLAGS = -I.. -I$(SQUIRREL)/include -I$(KAZZO)
@@ -34,11 +34,11 @@ else
 endif
 
 $(APP_GUI): $(OBJ_GUI) 
-       g++ -o $@ $(LDFLAG) $(OBJ_GUI) `$(WX_CONFIG) --libs core` -lusb -lsqstdlib -lsquirrel
+       g++ -o $@ $(LDFLAG) $(OBJ_GUI) `$(WX_CONFIG) --libs core,adv` -lusb -lsqstdlib -lsquirrel
 $(APP_CUI): $(OBJ_CUI) 
        g++ -o $@ $(LDFLAG) $(OBJ_CUI) -lusb -lsqstdlib -lsquirrel
 clean:
-       rm -f $(OBJ_CUI) $(OBJ_GUI) $(OBJ_CORE)
+       rm -f $(OBJ_CUI) $(OBJ_GUI) $(OBJ_CORE) anago.d
 
 anago.d:
        gcc -MM $(CFLAGS) $(CPPFLAGS) *.c > $@

diff --git a/client/trunk/file.c b/client/trunk/file.c
index 3663a0c..9b0e246 100644 (file)
--- a/client/trunk/file.c
+++ b/client/trunk/file.c
@@ -6,7 +6,7 @@
 #ifdef _UNICODE
   #define FOPEN(name, mode) _wfopen(name, L##mode)
 #else
-  #define FOPEN(name, mode) _fopen(name, mode)
+  #define FOPEN(name, mode) fopen(name, mode)
 #endif
 
 int buf_load(uint8_t *buf, const wgChar *file, int size)