notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified CFLAGS variable in Makefile (for easier handling by packagers)

Browse source
This commit is contained in:
William Kendrick 2003-07-20 09:11:13 +00:00
parent 9141bbd6a7
commit dc03f181eb
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Makefile
View file

@ -6,7 +6,7 @@
# bill@newbreedsoftware.com # bill@newbreedsoftware.com
# http://www.newbreedsoftware.com/tuxpaint/ # http://www.newbreedsoftware.com/tuxpaint/
# June 14, 2002 - July 19, 2003 # June 14, 2002 - July 20, 2003
# Where to install things: # Where to install things:
@ -74,7 +74,8 @@ SDL_CFLAGS=$(shell sdl-config --cflags)
# The entire set of CFLAGS: # The entire set of CFLAGS:
CFLAGS=-O2 -Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ CFLAGS=-O2 -Wall
DEFS=-DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \ -D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
-DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\" -DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\"
@ -115,11 +116,7 @@ beos:
ICON_PREFIX=./ ICON_PREFIX=./
X11_ICON_PREFIX=./ \ X11_ICON_PREFIX=./ \
LOCALE_PREFIX=/boot/home/config/share/locale/ \ LOCALE_PREFIX=/boot/home/config/share/locale/ \
CFLAGS="-O1 -funroll-loops -fomit-frame-pointer -pipe -Wall \ CFLAGS="-O1 -funroll-loops -fomit-frame-pointer -pipe -Wall" \
$(SDL_FLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
-DLOCALEDIR=\"$(LOCALE_PREFIX)\" \
-DCONFDIR=\"$(CONFDIR)\"" \
RSRC_CMD="xres -o tuxpaint tuxpaint.rsrc" \ RSRC_CMD="xres -o tuxpaint tuxpaint.rsrc" \
MIMESET_CMD="mimeset -f tuxpaint" \ MIMESET_CMD="mimeset -f tuxpaint" \
ARCH_LINKS="-lintl -lpng -lz -lbe" \ ARCH_LINKS="-lintl -lpng -lz -lbe" \
@ -166,11 +163,7 @@ install-beos:
ICON_PREFIX=./ ICON_PREFIX=./
X11_ICON_PREFIX=./ \ X11_ICON_PREFIX=./ \
LOCALE_PREFIX=/boot/home/config/share/locale/ \ LOCALE_PREFIX=/boot/home/config/share/locale/ \
CFLAGS="-O1 -funroll-loops -fomit-frame-pointer -pipe -Wall \ CFLAGS="-O1 -funroll-loops -fomit-frame-pointer -pipe -Wall" \
$(SDL_FLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
-DLOCALEDIR=\"$(LOCALE_PREFIX)\" \
-DCONFDIR=\"$(CONFDIR)\"" \
RSRC_CMD="xres -o tuxpaint tuxpaint.rsrc" \ RSRC_CMD="xres -o tuxpaint tuxpaint.rsrc" \
MIMESET_CMD="mimeset -f tuxpaint" \ MIMESET_CMD="mimeset -f tuxpaint" \
ARCH_LINKS="-lintl -lpng -lz -lbe" \ ARCH_LINKS="-lintl -lpng -lz -lbe" \
@ -516,7 +509,8 @@ install-man:
tuxpaint: obj/tuxpaint.o $(ARCH_LIBS) tuxpaint: obj/tuxpaint.o $(ARCH_LIBS)
@echo @echo
@echo "...Linking Tux Paint..." @echo "...Linking Tux Paint..."
@$(CC) $(CFLAGS) -o tuxpaint obj/tuxpaint.o $(ARCH_LIBS) $(SDL_LIBS) \ @$(CC) $(CFLAGS) $(SDL_CFLAGS) $(DEFS) \
-o tuxpaint obj/tuxpaint.o $(ARCH_LIBS) $(SDL_LIBS) \
-lm $(ARCH_LINKS) -lm $(ARCH_LINKS)
@$(RSRC_CMD) @$(RSRC_CMD)
@$(MIMESET_CMD) @$(MIMESET_CMD)
@ -541,13 +535,15 @@ obj/tuxpaint.o: src/tuxpaint.c obj \
$(ARCH_HEADERS) $(ARCH_HEADERS)
@echo @echo
@echo "...Compiling Tux Paint from source..." @echo "...Compiling Tux Paint from source..."
@$(CC) $(CFLAGS) -c src/tuxpaint.c -o obj/tuxpaint.o @$(CC) $(CFLAGS) $(SDL_CFLAGS) $(DEFS) \
-c src/tuxpaint.c -o obj/tuxpaint.o
obj/BeOS_Print.o: src/BeOS_Print.cpp obj src/BeOS_print.h obj/BeOS_Print.o: src/BeOS_Print.cpp obj src/BeOS_print.h
@echo @echo
@echo "...Compiling BeOS print support..." @echo "...Compiling BeOS print support..."
@$(CC) $(CFLAGS) -c src/BeOS_print.cpp -o obj/BeOS_print.o @$(CC) $(CFLAGS) $(SDL_CFLAGS) $(DEFS) \
-c src/BeOS_print.cpp -o obj/BeOS_print.o
# Build the translation files for gettext # Build the translation files for gettext

3
docs/CHANGES.txt
View file

@ -39,6 +39,9 @@ http://www.newbreedsoftware.com/tuxpaint/
'TTF_RenderUTF8...'. Thanks to Mantas Kriauciunas, Robert Glowczynski, 'TTF_RenderUTF8...'. Thanks to Mantas Kriauciunas, Robert Glowczynski,
John Popplewell and Karl Ove Hufthammer. John Popplewell and Karl Ove Hufthammer.
* Simplified CFLAGS variable in Makefile.
Ben Armstrong <synrg@sanctuary.nslug.ns.ca>
2003.Jun.17 (0.9.11) 2003.Jun.17 (0.9.11)
* Windows bugfixes. * Windows bugfixes.