@@ -14,7 +14,8 @@ BUILD_NAME=ZEngine-0.8.4 GL_LIB_NAME=GL ##Define compiler commands: -CC=g++ +CC=gcc #c compiler +CPPC=g++ #cpp compiler AR=ar rcs ###Define compiler options: config @@ -1,24 +1,31 @@ #Makefile for ZEngine +#Created and maintained by James Turk +#Incremental build optimizations submitted by Atani include $(CURDIR)/config #defines the user shouldn't change# INCLUDES = -I$(CURDIR)/include $(SDL_INC_PATH) $(GL_INC_PATH) LIBRARIES = -L$(CURDIR)/lib $(SDL_LIB_PATH) $(GL_LIB_PATH) -CFLAGS = $(EXTRA_OPTIONS) $(WARN_LEVEL) $(INCLUDES) $(LIBRARIES) +CPPFLAGS = $(EXTRA_OPTIONS) $(WARN_LEVEL) $(INCLUDES) $(LIBRARIES) +CFLAGS = -w LIB_OUT = $(CURDIR)/lib/libZEngineS.a ALL_TESTS = ZFontTest ZMouseTest ZMusicTest ZSoundTest ZTimerTest ZImageTest ZRectTest ZParticleTest %.o: $(CURDIR)/src/%.cpp - $(CC) $(CFLAGS) -c $< -o $@ + $(CPPC) $(CPPFLAGS) -c $< -o $@ %.o: $(CURDIR)/src/external/%.cpp + $(CPPC) $(CPPFLAGS) -c $< -o $@ + +%.o: $(CURDIR)/zlib/%.c $(CC) $(CFLAGS) -c $< -o $@ -SOURCES = $(wildcard $(CURDIR)/src/external/*.cpp) \ - $(wildcard $(CURDIR)/src/*.cpp) +CPP_SOURCES = $(wildcard $(CURDIR)/src/external/*.cpp) \ + $(wildcard $(CURDIR)/src/*.cpp) +C_SOURCES = $(wildcard $(CURDIR)/zlib/*.c) -#SOURCES with path stripped and .cpp changed to .o -OBJECTS = $(notdir $(SOURCES:.cpp=.o)) +#sources with path stripped and .cpp changed to .o +OBJECTS = $(notdir $(CPP_SOURCES:.cpp=.o)) $(notdir $(C_SOURCES:.c=.o)) #build targets# @@ -32,7 +39,7 @@ $(LIB_OUT): $(OBJECTS) $(ALL_TESTS) : $(LIB_OUT) @echo Building $@... - $(CC) $(CFLAGS) $(CURDIR)/test/$@.cpp -o $(CURDIR)/test/bin/$@ $(LIBS) + $(CPPC) $(CPPFLAGS) $(CURDIR)/test/$@.cpp -o $(CURDIR)/test/bin/$@ $(LIBS) @echo $@ compiled. .PHONY: $(ALL_TESTS) install clean veryclean makefile 316456b635fb41874d5d13a13a3ba4994a60deec James Turk james.p.turk@gmail.com http://github.com/jamesturk/zengine/commit/17ef13379063ccdf813eb17eb5749330033109ca 17ef13379063ccdf813eb17eb5749330033109ca 2003-10-05T12:21:03-07:00 2003-10-05T12:21:03-07:00 linux fixes bf31469a41c5253433ac4d3eb1e7b52da77c6a37 James Turk james.p.turk@gmail.com