diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-17 20:46:06 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-01-17 20:46:06 (GMT) |
| commit | 4a60b97c700c2f1843b7e99313554cb89fb5da4e (patch) | |
| tree | 3b33ef6f74a4e8a4ff5968a81b9c4c429ccaa7c6 /Makefile | |
| parent | 6273089bf486bf46ad325d72c7290ebb272bd3d8 (diff) | |
| download | powder-4a60b97c700c2f1843b7e99313554cb89fb5da4e.zip powder-4a60b97c700c2f1843b7e99313554cb89fb5da4e.tar.gz | |
Some minor changes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 37 |
1 files changed, 14 insertions, 23 deletions
@@ -1,22 +1,12 @@ -HEADERS := $(wildcard includes/*.h) +HEADERS := $(wildcard src/*.h) $(wildcard src/*/*.h) -OLD_SOURCES := $(wildcard src/*.c) -OLD_OBJS := $(patsubst src/%.c,build/obj/%.o,$(OLD_SOURCES)) +SOURCES := $(wildcard src/*.cpp) $(wildcard src/*/*.cpp) +OBJS += $(patsubst src/%.cpp,build/obj/powder.exe/%.o,$(SOURCES)) -EL_SOURCES := $(wildcard elements/*.cpp) -EL_OBJS := $(patsubst elements/%.cpp,build/obj/elements/%.o,$(EL_SOURCES)) -EL_PREREQ := $(patsubst build/obj/elements/%.o,build/obj/elements/%.powder.exe.o,$(EL_OBJS)) +FOLDERS := $(sort $(dir $(OBJS))) -CORE_SOURCES := $(wildcard src/*.cpp) -CORE_OBJS := $(patsubst src/%.cpp,build/obj/core/%.o,$(CORE_SOURCES)) -CORE_PREREQ := $(patsubst build/obj/core/%.o,build/obj/core/%.powder.exe.o,$(CORE_OBJS)) - -UI_SOURCES := $(wildcard src/interface/*.cpp) -UI_OBJS := $(patsubst src/interface/%.cpp,build/obj/ui/%.o,$(UI_SOURCES)) -UI_PREREQ := $(patsubst build/obj/ui/%.o,build/obj/ui/%.powder.exe.o,$(UI_OBJS)) - -CFLAGS := -Iincludes/ -Idata/ -DWIN32 -DWINCONSOLE -OFLAGS := -fkeep-inline-functions #-O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations +CFLAGS := -Wno-deprecated -Wno-deprecated-declarations -Isrc/ -Idata/ -DWIN32 -DWINCONSOLE +OFLAGS := -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -msse2 -fkeep-inline-functions LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 # -mwindows CFLAGS += $(OFLAGS) @@ -28,14 +18,15 @@ WIN_RES := i686-w64-mingw32-windres all: build/powder.exe powder.exe: build/powder.exe -build/powder.exe: $(EL_PREREQ) $(CORE_PREREQ) $(UI_PREREQ) - $(CPPC) $(CFLAGS) $(LDFLAGS) $(EXTRA_OBJS) $(EL_PREREQ) $(CORE_PREREQ) $(UI_PREREQ) $(LFLAGS) -o $@ -ggdb -build/obj/ui/%.powder.exe.o: src/interface/%.cpp $(HEADERS) - $(CPPC) -c $(CFLAGS) -o $@ $< -ggdb -build/obj/elements/%.powder.exe.o: elements/%.cpp $(HEADERS) - $(CPPC) -c $(CFLAGS) -o $@ $< -ggdb -build/obj/core/%.powder.exe.o: src/%.cpp $(HEADERS) + +build/powder.exe: buildpaths $(OBJS) + echo $(OBJS) + $(CPPC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LFLAGS) -o $@ -ggdb +build/obj/powder.exe/%.o: src/%.cpp $(HEADERS) $(CPPC) -c $(CFLAGS) -o $@ $< -ggdb +buildpaths: + $(shell mkdir build/obj/powder.exe/) + $(shell mkdir $(FOLDERS)) clean: rm build/obj/core/*.o |