summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-20 22:07:49 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-20 22:07:49 (GMT)
commitc8073657fcbfd1bfa72538d7babe4964857e7101 (patch)
treef3488e993c9828121b2f89ed2f639d2ebbe54dc9 /Makefile
parentc5e8b345219cd7d8ca4b0aa638f59a1fed2cd83b (diff)
downloadpowder-c8073657fcbfd1bfa72538d7babe4964857e7101.zip
powder-c8073657fcbfd1bfa72538d7babe4964857e7101.tar.gz
More stuff, need to fix memory leak
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile43
1 files changed, 26 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 43fa157..af59a9b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,45 @@
HEADERS := $(wildcard src/*.h) $(wildcard src/*/*.h)
SOURCES := $(wildcard src/*.cpp) $(wildcard src/*/*.cpp)
-OBJS += $(patsubst src/%.cpp,build/obj/powder.exe/%.o,$(SOURCES))
+OBJS := $(patsubst src/%.cpp,build/obj/%.o,$(SOURCES))
-FOLDERS := $(sort $(dir $(OBJS)))
+FOLDERS :=
-CFLAGS := -w -Isrc/ -Idata/ -DWIN32 -DWINCONSOLE
+CFLAGS := -w -Isrc/ -Idata/
OFLAGS := -fkeep-inline-functions #-O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -msse2
-LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 # -mwindows
-
-CFLAGS += $(OFLAGS)
CPPC := g++
CPPC_WIN := i686-w64-mingw32-gcc
WIN_RES := i686-w64-mingw32-windres
-all: build/powder.exe
+all: build/powder
+
powder.exe: build/powder.exe
+powder: build/powder
+
+build/powder.exe: CFLAGS += -DWIN32 -DWINCONSOLE
+build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 #-mwindows
+build/powder: CFLAGS += -DLIN32
+build/powder: LFLAGS := -lSDL -lm -lbz2
+
-build/powder.exe: buildpaths $(OBJS)
- echo $(OBJS)
- $(CPPC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LFLAGS) -o $@ -ggdb
+build/powder.exe: buildpaths-powder.exe $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS))
+ $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb
build/obj/powder.exe/%.o: src/%.cpp $(HEADERS)
- $(CPPC) -c $(CFLAGS) -o $@ $< -ggdb
-buildpaths:
+ $(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
+buildpaths-powder.exe:
$(shell mkdir build/obj/powder.exe/)
- $(shell mkdir $(FOLDERS))
+ $(shell mkdir $(sort $(dir $(OBJS))))
+
+build/powder: buildpaths-powder $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS))
+ $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb
+build/obj/powder/%.o: src/%.cpp $(HEADERS)
+ $(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
+buildpaths-powder:
+ $(shell mkdir build/obj/powder/)
+ $(shell mkdir $(sort $(dir $(OBJS))))
clean:
- rm build/obj/core/*.o
- rm build/obj/ui/*.o
- rm build/obj/elements/*.o
- rm build/obj/*.o
+ rm -r build/obj/*
rm build/*.exe \ No newline at end of file