diff --git a/Game/SConscript b/Game/SConscript deleted file mode 100644 index 651689f..0000000 --- a/Game/SConscript +++ /dev/null @@ -1,13 +0,0 @@ -#-------------# -# Import Vars # -#-------------# -Import('*') - -env.Install ('$destdir/$sharedir/',['blockattack.data']) -env.Alias('install',['$destdir/$sharedir']) - -env.Install ('$destdir/$sharedir/res/',[ -'puzzles/testPuzzles', -'puzzles/puzzle.levels']) -env.Alias('install', ['$destdir/$sharedir/res']) - diff --git a/SConstruct b/SConstruct deleted file mode 100644 index 843d9a7..0000000 --- a/SConstruct +++ /dev/null @@ -1,36 +0,0 @@ -import os -# Option # -opts = Options(args = ARGUMENTS) -opts.Add('destdir', 'Staging area to install BlockAttack to. Useful for packagers.', '') -opts.Add('prefix', 'Destination directory', '/usr/local') -opts.Add('sharedir', 'Directory to use to store data file', '$prefix/share/blockattack') -opts.Add('bindir', 'Directory to use to store data file', '$prefix/bin') -opts.Add('mandir', 'Directory to use to store data file', '$prefix/share/man') -opts.Add('CXXFLAGS', 'C++ flags', "-std=c++11") - - -print "Warning: scons is absolutely unsupported for building Block Attack - Rise of the blocks" - -# Copy Build Environment # -env = Environment(options = opts) -if 'PATH' in os.environ: - env.Append(PATH = os.environ['PATH']) -if 'CXX' in os.environ: - env.Append(CXX = os.environ['CXX']) -Export("env") -SConsignFile() - -# Sources # -SConscript('source/code/SConscript') - -# game materials (sharefiles) -SConscript('Game/SConscript') - -# manpage -SConscript('man/SConscript') -# icons menu -env.Install ('$destdir/$prefix/share/pixmaps/',['blockattack32.xpm','blockattack64.xpm']) -env.Alias('install', ['$destdir/$prefix/share/pixmaps/']) - -env.Install ('$destdir/$prefix/share/applications/',['blockattack.desktop']) -env.Alias('install', ['$destdir/$prefix/share/applications']) diff --git a/source/code/Makefile b/source/code/Makefile deleted file mode 100644 index abce4b0..0000000 --- a/source/code/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -GAMEDIR=../../Game/ - -BINARY=$(GAMEDIR)blockattack - --include sago/Makefile.sago - -ifndef CC -CC=gcc -endif - -ifdef CROSS -CXX=$(CROSS)g++ -endif - -BASE_CFLAGS=-c $(shell $(CROSS)sdl2-config --cflags) -std=c++11 - -ifndef BUILDDIR -BUILDDIR=build -endif - -BASE_LIBS=$(shell $(CROSS)sdl2-config --libs) $(shell $(CROSS)pkg-config SDL2_image SDL2_mixer SDL2_ttf --libs) $(SAGO_BASE_LIBS) - -#For developement only -ifndef DEBUG -DEBUG=1 -endif - -ifndef NETWORK -NETWORK=0 -endif - -#Compile with debug information or optimized. -ifeq ($(DEBUG),1) -BASE_CFLAGS += -g -DDEBUG=1 -Wall -Wno-sign-compare -else -BASE_CFLAGS += -O3 -endif - -ifeq ($(NETWORK),1) -BASE_CFLAGS += -DNETWORK=1 -BASE_LIBS += -lenet -else -BASE_CFLAGS += -DNETWORK=0 -endif - -ifeq ($(CROSS),i686-w64-mingw32.static-) -BASE_LIBS += -lws2_32 -endif - - -BASE_LIBS += -lphysfs - -OFILES=main.o highscore.o ReadKeyboard.o joypad.o listFiles.o common.o stats.o Libs/NFont.o Libs/SDL_FontCache.o MenuSystem.o menudef.o \ - puzzlehandler.o stageclearhandler.o icon.o os.o ${SAGO_O_FILES} - -ifeq ($(CROSS),i686-w64-mingw32.static-) -OFILES += winicon.res -BINARY := $(BINARY).exe -endif - -$(BINARY): $(OFILES) - $(CXX) -O -o $(BINARY) $(OFILES) $(BASE_LIBS) -#-lphysfs - -winicon.res: winicon.rc - $(CROSS)windres winicon.rc -O coff -o winicon.res - -%.o : %.cpp - $(CXX) -MD $(BASE_CFLAGS) -c -o $@ $< - @cp $*.d $*.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \ - rm -f $*.d - --include *.P - - -run: $(BINARY) - cd $(GAMEDIR) && ./blockattack - -clean: - rm *.o *.P Libs/*.o Libs/*.P sago/*.o sago/*.P ; true - -SOURCE_FILES = $(OFILES:.o=.cpp) - -format: - astyle -t -j -y -c -k1 -z2 -A2 --pad-header $(SOURCE_FILES) diff --git a/source/code/SConscript b/source/code/SConscript deleted file mode 100644 index 632251a..0000000 --- a/source/code/SConscript +++ /dev/null @@ -1,36 +0,0 @@ -#-------------# -# Import Vars # -#-------------# -Import('*') - -# Sources # -src = Split("""main.cpp -highscore.cpp -Libs/NFont.cpp -Libs/SDL_FontCache.cpp -sago/SagoDataHolder.cpp -sago/SagoMisc.cpp -sago/SagoSprite.cpp -sago/SagoSpriteHolder.cpp -ReadKeyboard.cpp -joypad.cpp -listFiles.cpp -stats.cpp -common.cpp -MenuSystem.cpp -menudef.cpp -puzzlehandler.cpp""") - -# Modify Build Environment # -env.ParseConfig('sdl2-config --cflags --libs') -env.Append(CPPDEFINES = [('SHAREDIR', '\\"$sharedir\\"')]) -env.Append(LIBS = ['SDL2', 'enet','SDL2_image','SDL2_mixer','SDL2_ttf','physfs','jsoncpp']) -env.Append(LIBPATH = ['/usr/lib']) - -# Compile Executable # -blockattack = env.Program('blockattack', src) -#Default(blockattack) - -# Install blockattack itself -env.Install('$destdir/$bindir/', blockattack) -env.Alias('install', ['$destdir/$bindir/'])