diff --git a/source/code/SConscript b/source/code/SConscript index a81c4b6..632251a 100644 --- a/source/code/SConscript +++ b/source/code/SConscript @@ -7,6 +7,11 @@ Import('*') 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 @@ -14,13 +19,12 @@ stats.cpp common.cpp MenuSystem.cpp menudef.cpp -puzzlehandler.cpp -CppSdlImageHolder.cpp""") +puzzlehandler.cpp""") # Modify Build Environment # -env.ParseConfig('sdl-config --cflags --libs') +env.ParseConfig('sdl2-config --cflags --libs') env.Append(CPPDEFINES = [('SHAREDIR', '\\"$sharedir\\"')]) -env.Append(LIBS = ['SDL', 'enet','SDL_image','SDL_mixer','SDL_ttf','physfs']) +env.Append(LIBS = ['SDL2', 'enet','SDL2_image','SDL2_mixer','SDL2_ttf','physfs','jsoncpp']) env.Append(LIBPATH = ['/usr/lib']) # Compile Executable # diff --git a/travis_build.script b/travis_build.script index ef52b77..1af8ae1 100755 --- a/travis_build.script +++ b/travis_build.script @@ -5,5 +5,5 @@ cp -r source/misc/travis_help/utf8_v2_3_4/source/utf8 source/code/ make -C source/code -f Makefile make clean ./packdata.sh -#scons -Q prefix=$HOME -Q sharedir=$HOME/share/ +scons -Q prefix=$HOME -Q sharedir=$HOME/share/