[rott-commits] r258 - in trunk/rott: . audiolib

[DONOTREPLY at icculus.org]

Author: fabian
Date: 2011-04-19 03:34:00 -0400 (Tue, 19 Apr 2011)
New Revision: 258

Modified:
   trunk/rott/Makefile
   trunk/rott/audiolib/Makefile
Log:
Further improvements to the Makefile (build with both MSYS make and mingw32-make, drop distclean rule, drop -Wl,--export-dynamic, etc.)

Modified: trunk/rott/Makefile
===================================================================
--- trunk/rott/Makefile	2011-04-18 11:51:03 UTC (rev 257)
+++ trunk/rott/Makefile	2011-04-19 07:34:00 UTC (rev 258)
@@ -1,7 +1,10 @@
 BINARY ?= rott
 
+CC ?= gcc
+
 CFLAGS += $(shell sdl-config --cflags)
 CFLAGS += -g
+CFLAGS += -O2
 CFLAGS += -Wall
 CFLAGS += -Wno-unused
 CFLAGS += $(EXTRACFLAGS)
@@ -11,7 +14,6 @@
 CPPFLAGS += -DPLATFORM_UNIX=1
 CPPFLAGS += $(EXTRACPPFLAGS)
 
-LDFLAGS += -Wl,-E
 LDFLAGS += $(EXTRALDFLAGS)
 
 LDLIBS += $(shell sdl-config --libs)
@@ -80,8 +82,8 @@
 $(OBJS): develop.h
 
 $(AUDIOLIB):
-	$(MAKE) -C audiolib CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)"
+	$(MAKE) -C audiolib
 
-clean distclean:
-	$(MAKE) -C audiolib clean
+clean:
+	$(MAKE) -C audiolib $@
 	rm -f $(OBJS) $(BINARY) $(BINARY).exe

Modified: trunk/rott/audiolib/Makefile
===================================================================
--- trunk/rott/audiolib/Makefile	2011-04-18 11:51:03 UTC (rev 257)
+++ trunk/rott/audiolib/Makefile	2011-04-19 07:34:00 UTC (rev 258)
@@ -1,13 +1,17 @@
 AUDIOLIB ?= audiolib.a
 
+AR ?= ar
+CC ?= gcc
+RANLIB ?= ranlib
+
 CFLAGS += $(shell sdl-config --cflags)
+CFLAGS += -g
+CFLAGS += -O2
+CFLAGS += -Wall
 
 LDLIBS += $(shell sdl-config --libs)
 LDLIBS += -lSDL_mixer
 
-AR ?= ar
-RANLIB ?= ranlib
-
 OBJS :=
 OBJS += fx_man.o
 OBJS += dsl.o
@@ -25,5 +29,5 @@
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
-clean distclean:
+clean:
 	rm -f $(AUDIOLIB) $(OBJS)