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

Integrated Makefile changes from MagerValp (Issue 188 comment 4) for MacOSX; adapted Windows build slightly; Updated Help screens for list of bug finders.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@904 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2009-07-07 19:26:37 +00:00
parent cadb762640
commit 72e6452d5b
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -47,8 +47,7 @@ ifdef COMSPEC
OBJDIR = obj/win32 OBJDIR = obj/win32
# Resources (icon) # Resources (icon)
WINDRES = windres.exe WINDRES = windres.exe
OBJRES = $(OBJDIR)/winres.o PLATFORMOBJ = $(OBJDIR)/winres.o
CFGOBJRES = $(OBJDIR)/wincfgres.o
PLATFORM = win32 PLATFORM = win32
PLATFORMFILES = SDL.dll SDL_image.dll libpng13.dll zlib1.dll gfx2.ico $(TTFLIBS) #some misc files we have to add to the release archive under windows. PLATFORMFILES = SDL.dll SDL_image.dll libpng13.dll zlib1.dll gfx2.ico $(TTFLIBS) #some misc files we have to add to the release archive under windows.
ZIP = zip ZIP = zip
@ -80,8 +79,12 @@ else
ZIP = zip ZIP = zip
PLATFORMFILES = gfx2.png PLATFORMFILES = gfx2.png
BIN = grafx2 BIN = grafx2
COPT = -D__macosx__ -D__linux__-W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT) -I/usr/X11/include # Where the SDL frameworks are located
LOPT = `sdl-config --libs` -framework SDL_image -framework SDL_ttf -L/usr/X11/lib -R/usr/X11/lib -lpng FWDIR = /Library/Frameworks
SDLCOPT = -arch i386 -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE
SDLLOPT = -arch i386 -L/usr/lib -framework SDL -framework SDL_image -framework SDL_ttf -framework Cocoa -framework Carbon -framework OpenGL
COPT = -D__macosx__ -D__linux__ -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g $(SDLCOPT) $(TTFCOPT) -I/usr/X11/include
LOPT = $(SDLLOPT) -L/usr/X11/lib -R/usr/X11/lib -lpng
# Use gcc for compiling. Use ncc to build a callgraph and analyze the code. # Use gcc for compiling. Use ncc to build a callgraph and analyze the code.
CC = gcc CC = gcc
#CC = nccgen -ncgcc -ncld -ncfabs #CC = nccgen -ncgcc -ncld -ncfabs
@ -262,9 +265,9 @@ $(MACAPPEXE) : $(BIN)
cp -r skins Grafx2.app/Contents/Resources cp -r skins Grafx2.app/Contents/Resources
cp -r gfx2.cfg Grafx2.app/Contents/Resources cp -r gfx2.cfg Grafx2.app/Contents/Resources
cp -r gfx2def.ini Grafx2.app/Contents/Resources cp -r gfx2def.ini Grafx2.app/Contents/Resources
cp -Rp /Library/Frameworks/SDL.framework Grafx2.app/Contents/Frameworks cp -Rp $(FWDIR)/SDL.framework Grafx2.app/Contents/Frameworks
cp -Rp /Library/Frameworks/SDL_image.framework Grafx2.app/Contents/Frameworks cp -Rp $(FWDIR)/SDL_image.framework Grafx2.app/Contents/Frameworks
cp -Rp /Library/Frameworks/SDL_ttf.framework Grafx2.app/Contents/Frameworks cp -Rp $(FWDIR)/SDL_ttf.framework Grafx2.app/Contents/Frameworks
cp $(BIN) $(MACAPPEXE) cp $(BIN) $(MACAPPEXE)
else else
all : $(BIN) all : $(BIN)
@ -289,8 +292,8 @@ ziprelease: version $(BIN) release
testsed : testsed :
$(BIN) : $(OBJ) $(OBJRES) $(BIN) : $(OBJ)
$(CC) $(OBJ) $(OBJRES) -o $(BIN) $(LOPT) $(CC) $(OBJ) -o $(BIN) $(LOPT)
# SVN revision number # SVN revision number
version.c : version.c :
@ -328,7 +331,7 @@ $(OBJDIR)/winres.o : gfx2.ico
echo "1 ICON \"gfx2.ico\"" | $(WINDRES) -o $(OBJDIR)/winres.o echo "1 ICON \"gfx2.ico\"" | $(WINDRES) -o $(OBJDIR)/winres.o
clean : clean :
$(DELCOMMAND) $(OBJ) $(OBJDIR)/version.o $(OBJRES) $(DELCOMMAND) $(OBJ)
$(DELCOMMAND) $(BIN) $(DELCOMMAND) $(BIN)
# Linux installation of the program # Linux installation of the program

13
helpfile.h
View File

@ -342,12 +342,13 @@ static const T_Help_table helptable_credits[] =
HELP_TITLE(" BUGFINDERS") HELP_TITLE(" BUGFINDERS")
HELP_TEXT ("") HELP_TEXT ("")
//HELP_TEXT ("0----5----0----5----0----5----0----5----0--X") //HELP_TEXT ("0----5----0----5----0----5----0----5----0--X")
HELP_TEXT (" BDCIron Ced El Topo ") HELP_TEXT (" blumunkee BDCIron Ced ")
HELP_TEXT (" fallenblood Frost Grimmy ") HELP_TEXT (" El Topo fallenblood Frost ")
HELP_TEXT (" Gürkan Sengün HoraK-FDF iLKke ") HELP_TEXT (" Grimmy Gürkan Sengün HoraK-FDF ")
HELP_TEXT (" keito kusma Lord Graga ") HELP_TEXT (" iLKke Jamon keito ")
HELP_TEXT (" MagerValp mind MooZ ") HELP_TEXT (" kusma Lord Graga MagerValp ")
HELP_TEXT (" the Peach richienyhus TeeEmCee ") HELP_TEXT (" mind MooZ the Peach ")
HELP_TEXT (" richienyhus tape.wyrm TeeEmCee ")
HELP_TEXT (" tempest Timo Kurrpa titus^Rab ") HELP_TEXT (" tempest Timo Kurrpa titus^Rab ")
HELP_TEXT (" Tobé 00ai99 ") HELP_TEXT (" Tobé 00ai99 ")
HELP_TEXT ("") HELP_TEXT ("")