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

* Move new defines to DEFS where they belong.

Browse source 
* Allow debug flag to be set in DEBUG_FLAGS so it is easily set by the caller without
  disturbing CFLAGS.
This commit is contained in:
Ben Armstrong 2005-10-15 00:37:49 +00:00
parent 00c3a8ab8f
commit 04bdc5d7ca
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Makefile
View file

@ -100,13 +100,16 @@ CFLAGS=-O2 -W -Wall -fno-common -ffast-math \
-Wbad-function-cast -Wwrite-strings \ -Wbad-function-cast -Wwrite-strings \
-Waggregate-return \ -Waggregate-return \
-Wstrict-prototypes -Wmissing-prototypes \ -Wstrict-prototypes -Wmissing-prototypes \
`src/test-option.sh -Wdeclaration-after-statement` \ `src/test-option.sh -Wdeclaration-after-statement`
-DVER_VERSION=\"$(VER_VERSION)\" \
-DVER_DATE=\"$(VER_DATE)\"
DEFS=-DDATA_PREFIX=\"$(DATA_PREFIX)/\" \ 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)/\" \
-DVER_VERSION=\"$(VER_VERSION)\" \
-DVER_DATE=\"$(VER_DATE)\"
DEBUG_FLAGS=
#DEBUG_FLAGS=-g
MOUSE_CFLAGS=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES MOUSE_CFLAGS=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES
@ -927,7 +930,7 @@ install-man:
tuxpaint: obj/tuxpaint.o $(HQXX_O) $(ARCH_LIBS) tuxpaint: obj/tuxpaint.o $(HQXX_O) $(ARCH_LIBS)
@echo @echo
@echo "...Linking Tux Paint..." @echo "...Linking Tux Paint..."
@$(CC) $(CFLAGS) $(SDL_CFLAGS) $(DEFS) \ @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) \
-o tuxpaint obj/tuxpaint.o $(HQXX_O) \ -o tuxpaint obj/tuxpaint.o $(HQXX_O) \
$(ARCH_LIBS) $(SDL_LIBS) \ $(ARCH_LIBS) $(SDL_LIBS) \
-lm $(ARCH_LINKS) -lm $(ARCH_LINKS)
@ -957,20 +960,20 @@ 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) $(SDL_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) \ @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) \
-c src/tuxpaint.c -o obj/tuxpaint.o -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) $(SDL_CFLAGS) $(DEFS) \ @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) \
-c src/BeOS_print.cpp -o obj/BeOS_print.o -c src/BeOS_print.cpp -o obj/BeOS_print.o
obj/win32_print.o: src/win32_print.c obj src/win32_print.h obj/win32_print.o: src/win32_print.c obj src/win32_print.h
@echo @echo
@echo "...Compiling win32 print support..." @echo "...Compiling win32 print support..."
@$(CC) $(CFLAGS) $(SDL_CFLAGS) $(DEFS) \ @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) \
-c src/win32_print.c -o obj/win32_print.o -c src/win32_print.c -o obj/win32_print.o
obj/resource.o: visualc/resources.rc obj visualc/resource.h obj/resource.o: visualc/resources.rc obj visualc/resource.h