diff --git a/config b/config index 9325826..b9fb063 100644 --- a/config +++ b/config @@ -8,9 +8,11 @@ BUILD_NAME=ZEngine-0.8.4 #GL_LIB_NAME=OpenGL32 #GL_INC_PATH=-I/usr/include/w32api/GL #GL_LIB_PATH=-L/lib/w32api +#EXTRA_OPTIONS=-mno-cygwin -O2 ###Linux### GL_LIB_NAME=GL +EXTRA_OPTIONS=-O2 ##Define compiler commands: CC=g++ diff --git a/makefile b/makefile index b7d9687..5ae7277 100644 --- a/makefile +++ b/makefile @@ -1,8 +1,10 @@ #Makefile for ZEngine -#defines the user shouldn't change# include ./config -CFLAGS = -O2 $(WARN_LEVEL) -I./include $(SDL_INC_PATH) $(GL_INC_PATH) -L./lib $(SDL_LIB_PATH) $(GL_LIB_PATH) +#defines the user shouldn't change# +INCLUDES = -I./include $(SDL_INC_PATH) $(GL_INC_PATH) +LIBRARIES = -L./lib $(SDL_LIB_PATH) $(GL_LIB_PATH) +CFLAGS = $(EXTRA_OPTIONS) $(WARN_LEVEL) $(INCLUDES) $(LIBRARIES) LIB_OUT = ./lib/libZEngineS.a ALL_TESTS = ZFontTest ZMouseTest ZMusicTest ZSoundTest ZTimerTest ZImageTest ZRectTest ZParticleTest