mirror of
https://github.com/The-Powder-Toy/The-Powder-Toy.git
synced 2025-01-29 12:40:01 +01:00
Remove makefile, changes to generator, SConscript to work together
This commit is contained in:
build.powdertoy.co.uk
parent
64ebd1117b
commit
281f5518b2
102
Makefile
102
Makefile
@ -1,102 +0,0 @@
|
||||
HEADERS := $(wildcard src/*.h) $(wildcard src/*/*.h) $(wildcard generated/*.h)
|
||||
|
||||
SOURCES := $(wildcard src/*.cpp) $(wildcard src/*/*.cpp) $(wildcard src/*/*/*.cpp) $(wildcard generated/*.cpp)
|
||||
GENERATEDSOURCES := $(wildcard src/*/*/*.h) $(wildcard src/*/*/*.cpp)
|
||||
OBJS := $(patsubst src/%.cpp,build/obj/%.o,$(SOURCES))
|
||||
|
||||
CFLAGS := -w -Isrc/ -Idata/ -Igenerated/
|
||||
OFLAGS := -fkeep-inline-functions
|
||||
|
||||
CPPC := g++
|
||||
CPPC_WIN := g++
|
||||
WIN_RES := windres
|
||||
|
||||
all: build/powder
|
||||
|
||||
powder-release.exe: build/powder-release.exe
|
||||
powder.exe: build/powder.exe
|
||||
powder-release: build/powder-release
|
||||
powder-opengl-release: build/powder-opengl-release
|
||||
powder: build/powder
|
||||
powder-opengl: build/powder-opengl
|
||||
powder-x: build/powder-x
|
||||
powder-x.jnilib: build/powder-x.jnilib
|
||||
|
||||
build/powder-release.exe: CFLAGS += -DWIN32 -O3 -ftree-vectorize -msse2 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations
|
||||
build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 -mwindows
|
||||
build/powder.exe: CFLAGS += -DWIN32
|
||||
build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 #-mwindows
|
||||
build/powder-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations
|
||||
build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f
|
||||
build/powder-opengl-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -DOGLR -DPIX32OGL -DPIXALPHA
|
||||
build/powder-opengl-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f -lGL -lGLEW -DOGLR -DPIX32OGL -DPIXALPHA
|
||||
build/powder: CFLAGS += -DLIN32
|
||||
build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f
|
||||
build/powder-opengl: CFLAGS += -DLIN32 -DOGLR -DPIX32OGL -DPIXALPHA
|
||||
build/powder-opengl: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f -lGL -lGLEW
|
||||
#build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -I/Library/Frameworks/OpenGL.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA
|
||||
#build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -framework Cocoa -framework OpenGL
|
||||
build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -DPIX32BGRA
|
||||
build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -framework Cocoa
|
||||
build/powder-x.jnilib: CFLAGS += -DMACOSX -DUSE_JNI -I/Library/Frameworks/Lua.framework/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA
|
||||
build/powder-x.jnilib: LFLAGS := -lm -lbz2 -lfftw3f -framework Lua -framework JavaVM -framework Cocoa -framework OpenGL
|
||||
|
||||
CFLAGS += -DGRAVFFT -DLUACONSOLE -DUSE_SDL
|
||||
|
||||
build/powder-release.exe: $(SOURCES) generate build/powder-res.o
|
||||
$(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) build/powder-res.o -o $@
|
||||
strip $@
|
||||
build/powder-res.o: resources/powder-res.rc resources/powder.ico resources/document.ico
|
||||
cd resources && $(WIN_RES) powder-res.rc powder-res.o
|
||||
mv resources/powder-res.o build/powder-res.o
|
||||
build/powder-release: $(SOURCES)
|
||||
$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@
|
||||
strip $@
|
||||
build/powder-opengl-release: $(SOURCES)
|
||||
$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@
|
||||
strip $@
|
||||
build/powder.exe: buildpaths-powder.exe generate $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o
|
||||
$(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(LFLAGS) -o $@ -ggdb
|
||||
build/obj/powder.exe/%.o: src/%.cpp $(HEADERS)
|
||||
$(CPPC_WIN) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
|
||||
buildpaths-powder.exe:
|
||||
$(shell mkdir -p build/obj/powder.exe/)
|
||||
$(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)))))
|
||||
|
||||
build/powder: buildpaths-powder generate $(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/powder-opengl: buildpaths-powder-opengl generate $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS))
|
||||
$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb
|
||||
build/obj/powder/%.o: src/%.cpp $(HEADERS)
|
||||
$(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
|
||||
build/obj/powder-opengl/%.o: src/%.cpp $(HEADERS)
|
||||
$(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
|
||||
buildpaths-powder:
|
||||
$(shell mkdir -p build/obj/powder/)
|
||||
$(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)))))
|
||||
buildpaths-powder-opengl:
|
||||
$(shell mkdir -p build/obj/powder-opengl/)
|
||||
$(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)))))
|
||||
build/powder-x: buildpaths-powder-x generate $(patsubst build/obj/%.o,build/obj/powder-x/%.o,$(OBJS))
|
||||
$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-x/%.o,$(OBJS)) SDLmain.m $(LFLAGS) -o $@ -ggdb
|
||||
build/obj/powder-x/%.o: src/%.cpp $(HEADERS)
|
||||
$(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
|
||||
buildpaths-powder-x:
|
||||
$(shell mkdir -p build/obj/powder-x/)
|
||||
$(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder-x/%.o,$(OBJS)))))
|
||||
|
||||
build/powder-x.jnilib: buildpaths-powder-x.jnilib generate $(patsubst build/obj/%.o,build/obj/powder-x.jnilib/%.o,$(OBJS))
|
||||
$(CPPC) -dynamiclib $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-x.jnilib/%.o,$(OBJS)) src/powdertoyjava/OpenGLCanvasMacOS.mm $(LFLAGS) -o $@ -ggdb
|
||||
build/obj/powder-x.jnilib/%.o: src/%.cpp $(HEADERS)
|
||||
$(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
|
||||
buildpaths-powder-x.jnilib:
|
||||
$(shell mkdir -p build/obj/powder-x.jnilib/)
|
||||
$(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder-x.jnilib/%.o,$(OBJS)))))
|
||||
|
||||
generate: $(GENERATEDSOURCES)
|
||||
touch generate
|
||||
python generator.py
|
||||
|
||||
clean:
|
||||
rm -r build/obj/*
|
||||
rm build/*.exe
|
||||
@ -174,7 +174,9 @@ if(GetOption('win32')):
|
||||
sources+=Glob("src/*/*.cpp")
|
||||
sources+=Glob("src/simulation/elements/*.cpp")
|
||||
sources+=Glob("src/simulation/tools/*.cpp")
|
||||
sources+=Glob("generated/*.cpp")
|
||||
sources+=Glob("generated/ToolClasses.cpp")
|
||||
sources+=Glob("generated/ElementClasses.cpp")
|
||||
|
||||
|
||||
SetupSpawn(env)
|
||||
|
||||
@ -195,6 +197,8 @@ if(GetOption('macosx')):
|
||||
if(GetOption('win32')):
|
||||
programName += ".exe"
|
||||
|
||||
env.Command(['generated/ElementClasses.cpp', 'generated/ElementClasses.h'], Glob('src/simulation/elements/*.cpp'), "python generator.py elements $TARGETS $SOURCES")
|
||||
env.Command(['generated/ToolClasses.cpp', 'generated/ToolClasses.h'], Glob('src/simulation/tools/*.cpp'), "python generateTools.py $TARGETS $SOURCES")
|
||||
t=env.Program(target=programName, source=sources)
|
||||
Default(t)
|
||||
|
||||
|
||||
31
generator.py
31
generator.py
@ -1,10 +1,7 @@
|
||||
import re, os, shutil, string
|
||||
import re, os, shutil, string, sys
|
||||
|
||||
if os.path.isdir("generated/"):
|
||||
shutil.rmtree("generated/")
|
||||
os.mkdir("generated")
|
||||
def generateElements(elementFiles, outputCpp, outputH):
|
||||
|
||||
def generateElements():
|
||||
elementClasses = dict()
|
||||
|
||||
elementHeader = """#ifndef ELEMENTCLASSES_H
|
||||
@ -16,9 +13,8 @@ def generateElements():
|
||||
|
||||
directives = []
|
||||
|
||||
elementFiles = os.listdir("src/simulation/elements")
|
||||
for elementFile in elementFiles:
|
||||
f = open("src/simulation/elements/"+elementFile, "r")
|
||||
f = open(elementFile, "r")
|
||||
fileData = f.read()
|
||||
f.close()
|
||||
|
||||
@ -70,15 +66,15 @@ def generateElements():
|
||||
}
|
||||
""";
|
||||
|
||||
f = open("generated/ElementClasses.h", "w")
|
||||
f = open(outputH, "w")
|
||||
f.write(elementHeader)
|
||||
f.close()
|
||||
|
||||
f = open("generated/ElementClasses.cpp", "w")
|
||||
f = open(outputCpp, "w")
|
||||
f.write(elementContent)
|
||||
f.close()
|
||||
|
||||
def generateTools():
|
||||
def generateTools(toolFiles, outputCpp, outputH):
|
||||
toolClasses = dict()
|
||||
|
||||
toolHeader = """#ifndef TOOLCLASSES_H
|
||||
@ -89,10 +85,9 @@ def generateTools():
|
||||
"""
|
||||
|
||||
directives = []
|
||||
|
||||
toolFiles = os.listdir("src/simulation/tools")
|
||||
|
||||
for toolFile in toolFiles:
|
||||
f = open("src/simulation/tools/"+toolFile, "r")
|
||||
f = open(toolFile, "r")
|
||||
fileData = f.read()
|
||||
f.close()
|
||||
|
||||
@ -145,13 +140,15 @@ def generateTools():
|
||||
}
|
||||
""";
|
||||
|
||||
f = open("generated/ToolClasses.h", "w")
|
||||
f = open(outputH, "w")
|
||||
f.write(toolHeader)
|
||||
f.close()
|
||||
|
||||
f = open("generated/ToolClasses.cpp", "w")
|
||||
f = open(outputCpp, "w")
|
||||
f.write(toolContent)
|
||||
f.close()
|
||||
|
||||
generateElements()
|
||||
generateTools()
|
||||
if(sys.argv[1] == "elements"):
|
||||
generateElements(sys.argv[4:], sys.argv[2], sys.argv[3])
|
||||
elif(sys.argv[1] == "tools"):
|
||||
generateTools(sys.argv[4:], sys.argv[2], sys.argv[3])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user