m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More joystick fixes and some patches to the makefile (we need a different name for the strip binary when cross compiling). Please update your platform with new STRIP = strip line ...

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@464 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2009-01-05 22:23:57 +00:00
parent 8c0475c43e
commit bdf86b06a8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -139,6 +139,7 @@ else
MKDIR = mkdir -p MKDIR = mkdir -p
RMDIR = rmdir RMDIR = rmdir
CP = cp CP = cp
STRIP = strip
ifdef WIN32CROSS ifdef WIN32CROSS
#cross compile a Win32 executable #cross compile a Win32 executable
@ -148,6 +149,7 @@ else
COPT = -W -Wall -Wdeclaration-after-statement -O -g -ggdb -Dmain=SDL_main `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --cflags` $(TTFCOPT) COPT = -W -Wall -Wdeclaration-after-statement -O -g -ggdb -Dmain=SDL_main `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --cflags` $(TTFCOPT)
LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --libs` -lSDL_image $(TTFLOPT) LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --libs` -lSDL_image $(TTFLOPT)
OBJDIR = obj/win32 OBJDIR = obj/win32
PLATFORM = win32
else else
ifdef GP2XCROSS ifdef GP2XCROSS
@ -159,6 +161,8 @@ else
LOPT = -static -lSDL_image `/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin/sdl-config --static-libs` -ljpeg -lpng -lz -lm $(TTFLOPT) LOPT = -static -lSDL_image `/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin/sdl-config --static-libs` -ljpeg -lpng -lz -lm $(TTFLOPT)
OBJDIR = obj/gp2x OBJDIR = obj/gp2x
NOTTF = 1 NOTTF = 1
PLATFORM = gp2x
STRIP = /opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin/arm-open2x-linux-strip
else else
# Compiles a regular linux exectutable for the native platform # Compiles a regular linux exectutable for the native platform
@ -203,8 +207,8 @@ all : $(BIN) $(CFGBIN)
debug : $(BIN) debug : $(BIN)
release : $(BIN) $(CFGBIN) release : $(BIN) $(CFGBIN)
strip $(BIN) $(STRIP) $(BIN)
strip $(CFGBIN) $(STRIP) $(CFGBIN)
# A release zip archive # A release zip archive
ziprelease: version $(BIN) $(BINCFG) release ziprelease: version $(BIN) $(BINCFG) release

2
divers.c
View File

@ -484,7 +484,7 @@ int Get_input(void)
INPUT_Nouveau_Mouse_X*Pixel_width, INPUT_Nouveau_Mouse_X*Pixel_width,
INPUT_Nouveau_Mouse_Y*Pixel_height INPUT_Nouveau_Mouse_Y*Pixel_height
); );
Wait_VBL(); // Histoire que ça bouge pas trop vite ... SDL_Delay(10/Menu_Facteur_X); // Histoire que ça bouge pas trop vite ...
} }
else{ else{
Flush_update(); Flush_update();