mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-10 18:34:21 +02:00
Code Issues Projects Releases Wiki Activity

Makefile for Linux and finished fixing case issues with includes

Browse Source
This commit is contained in:
Simon Robertshaw
2012-01-20 22:19:45 +00:00
parent 4949a5eac0
commit 6a331fdaf8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -30,7 +30,7 @@ build/obj/powder.exe/%.o: src/%.cpp $(HEADERS)
$(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb $(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
buildpaths-powder.exe: buildpaths-powder.exe:
$(shell mkdir build/obj/powder.exe/) $(shell mkdir build/obj/powder.exe/)
$(shell mkdir $(sort $(dir $(OBJS)))) $(shell mkdir $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)))))
build/powder: buildpaths-powder $(patsubst build/obj/%.o,build/obj/powder/%.o,$(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 $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb
@@ -38,8 +38,8 @@ build/obj/powder/%.o: src/%.cpp $(HEADERS)
$(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb $(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
buildpaths-powder: buildpaths-powder:
$(shell mkdir build/obj/powder/) $(shell mkdir build/obj/powder/)
$(shell mkdir $(sort $(dir $(OBJS)))) $(shell mkdir $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)))))
clean: clean:
rm -r build/obj/* rm -r build/obj/*
rm build/*.exe rm build/*.exe

2
data/hmap.h
View File

File diff suppressed because one or more lines are too long

2
src/Graphics.cpp
View File

@@ -28,7 +28,7 @@
//#include "ElementGraphics.h" //#include "ElementGraphics.h"
#define INCLUDE_FONTDATA #define INCLUDE_FONTDATA
#include "font.h" #include "font.h"
#include "misc.h" #include "Misc.h"
#include "hmap.h" #include "hmap.h"
//unsigned cmode = CM_FIRE; //unsigned cmode = CM_FIRE;