Browse Source

Added QtCreator projects for encoder and luagen

setaylor 11 years ago
parent
commit
1250ce12df

+ 3 - 3
.gitignore

@@ -57,9 +57,9 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /gameplay.xcworkspace/xcuserdata
 /gameplay/gameplay.xcodeproj/xcuserdata
 
-/tools/gameplay-encoder/Debug
-/tools/gameplay-encoder/Release
-/tools/gameplay-encoder/gameplay-encoder.xcodeproj/xcuserdata
+/tools/encoder/Debug
+/tools/encoder/Release
+/tools/encoder/gameplay-encoder.xcodeproj/xcuserdata
 
 /tools/luagen/Release
 /tools/luagen/Debug

+ 18 - 25
gameplay/gameplay.pro

@@ -608,16 +608,6 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_VertexFormatUsage.h \
     src/lua/lua_VerticalLayout.h
 
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}
-
-DEFINES += __linux__
-DEFINES += GP_USE_GAMEPAD
-
-QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
-
 INCLUDEPATH += $$PWD/../gameplay/src
 INCLUDEPATH += $$PWD/../external-deps/bullet/include
 INCLUDEPATH += $$PWD/../external-deps/lua/include
@@ -626,21 +616,24 @@ INCLUDEPATH += $$PWD/../external-deps/zlib/include
 INCLUDEPATH += $$PWD/../external-deps/ogg/include
 INCLUDEPATH += $$PWD/../external-deps/vorbis/include
 INCLUDEPATH += $$PWD/../external-deps/openal/include
-INCLUDEPATH += $$PWD/../external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
-
+linux:!android:!android: INCLUDEPATH += $$PWD/../external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+
 

+ 51 - 56
samples/browser/sample-browser.pro

@@ -65,65 +65,60 @@ INCLUDEPATH += $$PWD/../../external-deps/zlib/include
 INCLUDEPATH += $$PWD/../../external-deps/ogg/include
 INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
 INCLUDEPATH += $$PWD/../../external-deps/openal/include
-INCLUDEPATH += $$PWD/../../external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
+linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
-DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
-unix:!macx: DEFINES += __linux__
-unix:!macx: QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
+linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
+linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
+linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
+linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -lm
+linux:!android: LIBS += -lGL
+linux:!android: LIBS += -lrt
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lX11
+linux:!android: LIBS += -lpthread
+linux:!android: LIBS += -lgtk-x11-2.0
+linux:!android: LIBS += -lglib-2.0
+linux:!android: LIBS += -lgobject-2.0
 
-unix:!macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-unix:!macx: LIBS += -lm
-unix:!macx: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-unix:!macx: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-unix:!macx: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-unix:!macx: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-unix:!macx: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-unix:!macx: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-unix:!macx: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
-unix:!macx: LIBS += -lGL
-unix:!macx: LIBS += -lrt
-unix:!macx: LIBS += -ldl
-unix:!macx: LIBS += -lX11
-unix:!macx: LIBS += -lpthread
-unix:!macx: LIBS += -lgtk-x11-2.0
-unix:!macx: LIBS += -lglib-2.0
-unix:!macx: LIBS += -lgobject-2.0
+linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
 
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}

+ 52 - 57
samples/character/sample-character.pro

@@ -21,66 +21,61 @@ INCLUDEPATH += $$PWD/../../external-deps/zlib/include
 INCLUDEPATH += $$PWD/../../external-deps/ogg/include
 INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
 INCLUDEPATH += $$PWD/../../external-deps/openal/include
-INCLUDEPATH += $$PWD/../../external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
+linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
-DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
-unix:!macx: DEFINES += __linux__
-unix:!macx: QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
+linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
+linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
+linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
+linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -lm
+linux:!android: LIBS += -lGL
+linux:!android: LIBS += -lrt
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lX11
+linux:!android: LIBS += -lpthread
+linux:!android: LIBS += -lgtk-x11-2.0
+linux:!android: LIBS += -lglib-2.0
+linux:!android: LIBS += -lgobject-2.0
 
-unix:!macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-unix:!macx: LIBS += -lm
-unix:!macx: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-unix:!macx: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-unix:!macx: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-unix:!macx: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-unix:!macx: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-unix:!macx: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-unix:!macx: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
-unix:!macx: LIBS += -lGL
-unix:!macx: LIBS += -lrt
-unix:!macx: LIBS += -ldl
-unix:!macx: LIBS += -lX11
-unix:!macx: LIBS += -lpthread
-unix:!macx: LIBS += -lgtk-x11-2.0
-unix:!macx: LIBS += -lglib-2.0
-unix:!macx: LIBS += -lgobject-2.0
+linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
 
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config ../game.config$$escape_expand(\n\t))
 
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config ../game.config$$escape_expand(\n\t))
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}

+ 51 - 56
samples/lua/sample-lua.pro

@@ -21,66 +21,61 @@ INCLUDEPATH += $$PWD/../../external-deps/zlib/include
 INCLUDEPATH += $$PWD/../../external-deps/ogg/include
 INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
 INCLUDEPATH += $$PWD/../../external-deps/openal/include
-INCLUDEPATH += $$PWD/../../external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
+linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
-DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
-unix:!macx: DEFINES += __linux__
-unix:!macx: QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
+linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
+linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
+linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
+linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -lm
+linux:!android: LIBS += -lGL
+linux:!android: LIBS += -lrt
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lX11
+linux:!android: LIBS += -lpthread
+linux:!android: LIBS += -lgtk-x11-2.0
+linux:!android: LIBS += -lglib-2.0
+linux:!android: LIBS += -lgobject-2.0
 
-unix:!macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-unix:!macx: LIBS += -lm
-unix:!macx: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-unix:!macx: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-unix:!macx: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-unix:!macx: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-unix:!macx: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-unix:!macx: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-unix:!macx: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
-unix:!macx: LIBS += -lGL
-unix:!macx: LIBS += -lrt
-unix:!macx: LIBS += -ldl
-unix:!macx: LIBS += -lX11
-unix:!macx: LIBS += -lpthread
-unix:!macx: LIBS += -lgtk-x11-2.0
-unix:!macx: LIBS += -lglib-2.0
-unix:!macx: LIBS += -lgobject-2.0
+linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
 
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}
 

+ 51 - 56
samples/mesh/sample-mesh.pro

@@ -21,65 +21,60 @@ INCLUDEPATH += $$PWD/../../external-deps/zlib/include
 INCLUDEPATH += $$PWD/../../external-deps/ogg/include
 INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
 INCLUDEPATH += $$PWD/../../external-deps/openal/include
-INCLUDEPATH += $$PWD/../../external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
+linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
-DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
-unix:!macx: DEFINES += __linux__
-unix:!macx: QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
+linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
+linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
+linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
+linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -lm
+linux:!android: LIBS += -lGL
+linux:!android: LIBS += -lrt
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lX11
+linux:!android: LIBS += -lpthread
+linux:!android: LIBS += -lgtk-x11-2.0
+linux:!android: LIBS += -lglib-2.0
+linux:!android: LIBS += -lgobject-2.0
 
-unix:!macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-unix:!macx: LIBS += -lm
-unix:!macx: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-unix:!macx: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-unix:!macx: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-unix:!macx: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-unix:!macx: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-unix:!macx: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-unix:!macx: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
-unix:!macx: LIBS += -lGL
-unix:!macx: LIBS += -lrt
-unix:!macx: LIBS += -ldl
-unix:!macx: LIBS += -lX11
-unix:!macx: LIBS += -lpthread
-unix:!macx: LIBS += -lgtk-x11-2.0
-unix:!macx: LIBS += -lglib-2.0
-unix:!macx: LIBS += -lgobject-2.0
+linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
 
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}

+ 2 - 2
samples/mesh/src/MeshGame.cpp

@@ -121,7 +121,7 @@ void MeshGame::drawFrameRate(Font* font, const Vector4& color, unsigned int x, u
     char buffer[10];
     sprintf(buffer, "%u", fps);
     font->start();
-    font->drawText(buffer, x, y, color, font->getSize());
+    font->drawText(buffer, x, y, color, 20);
     font->finish();
 }
 
@@ -217,4 +217,4 @@ Model* MeshGame::createGridModel(unsigned int lineCount)
     model->setMaterial("res/mesh.material#grid");
     SAFE_RELEASE(mesh);
     return model;
-}
+}

+ 51 - 56
samples/particles/sample-particles.pro

@@ -21,65 +21,60 @@ INCLUDEPATH += $$PWD/../../external-deps/zlib/include
 INCLUDEPATH += $$PWD/../../external-deps/ogg/include
 INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
 INCLUDEPATH += $$PWD/../../external-deps/openal/include
-INCLUDEPATH += $$PWD/../../external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
+linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
-DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
-unix:!macx: DEFINES += __linux__
-unix:!macx: QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
+linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
+linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
+linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
+linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -lm
+linux:!android: LIBS += -lGL
+linux:!android: LIBS += -lrt
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lX11
+linux:!android: LIBS += -lpthread
+linux:!android: LIBS += -lgtk-x11-2.0
+linux:!android: LIBS += -lglib-2.0
+linux:!android: LIBS += -lgobject-2.0
 
-unix:!macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-unix:!macx: LIBS += -lm
-unix:!macx: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-unix:!macx: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-unix:!macx: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-unix:!macx: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-unix:!macx: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-unix:!macx: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-unix:!macx: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
-unix:!macx: LIBS += -lGL
-unix:!macx: LIBS += -lrt
-unix:!macx: LIBS += -ldl
-unix:!macx: LIBS += -lX11
-unix:!macx: LIBS += -lpthread
-unix:!macx: LIBS += -lgtk-x11-2.0
-unix:!macx: LIBS += -lglib-2.0
-unix:!macx: LIBS += -lgobject-2.0
+linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
 
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}

+ 52 - 58
samples/racer/sample-racer.pro

@@ -21,67 +21,61 @@ INCLUDEPATH += $$PWD/../../external-deps/zlib/include
 INCLUDEPATH += $$PWD/../../external-deps/ogg/include
 INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
 INCLUDEPATH += $$PWD/../../external-deps/openal/include
-INCLUDEPATH += $$PWD/../../external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
+linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
-DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
-unix:!macx: DEFINES += __linux__
-unix:!macx: QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
+linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
+linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
+linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
+linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -lm
+linux:!android: LIBS += -lGL
+linux:!android: LIBS += -lrt
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lX11
+linux:!android: LIBS += -lpthread
+linux:!android: LIBS += -lgtk-x11-2.0
+linux:!android: LIBS += -lglib-2.0
+linux:!android: LIBS += -lgobject-2.0
 
-unix:!macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-unix:!macx: LIBS += -lm
-unix:!macx: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-unix:!macx: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-unix:!macx: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-unix:!macx: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-unix:!macx: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-unix:!macx: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-unix:!macx: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
-unix:!macx: LIBS += -lGL
-unix:!macx: LIBS += -lrt
-unix:!macx: LIBS += -ldl
-unix:!macx: LIBS += -lX11
-unix:!macx: LIBS += -lpthread
-unix:!macx: LIBS += -lgtk-x11-2.0
-unix:!macx: LIBS += -lglib-2.0
-unix:!macx: LIBS += -lgobject-2.0
+linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
 
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
-
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config ../game.config$$escape_expand(\n\t))
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config ../game.config$$escape_expand(\n\t))
 

+ 51 - 56
samples/spaceship/sample-spaceship.pro

@@ -21,65 +21,60 @@ INCLUDEPATH += $$PWD/../../external-deps/zlib/include
 INCLUDEPATH += $$PWD/../../external-deps/ogg/include
 INCLUDEPATH += $$PWD/../../external-deps/vorbis/include
 INCLUDEPATH += $$PWD/../../external-deps/openal/include
-INCLUDEPATH += $$PWD/../../external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
+linux:!android: INCLUDEPATH += $$PWD/../../external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
-DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
-unix:!macx: DEFINES += __linux__
-unix:!macx: QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
+linux:!android: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
+linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
+linux:!android: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
+linux:!android: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
+linux:!android: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
+linux:!android: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -lm
+linux:!android: LIBS += -lGL
+linux:!android: LIBS += -lrt
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lX11
+linux:!android: LIBS += -lpthread
+linux:!android: LIBS += -lgtk-x11-2.0
+linux:!android: LIBS += -lglib-2.0
+linux:!android: LIBS += -lgobject-2.0
 
-unix:!macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
-unix:!macx: LIBS += -lm
-unix:!macx: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
-unix:!macx: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
-unix:!macx: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
-unix:!macx: LIBS += -L$$PWD/../../external-deps/vorbis/lib/linux/x64/ -lvorbis
-unix:!macx: LIBS += -L$$PWD/../../external-deps/ogg/lib/linux/x64/ -logg
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lBulletCollision
-unix:!macx: LIBS += -L$$PWD/../../external-deps/bullet/lib/linux/x64/ -lLinearMath
-unix:!macx: LIBS += -L$$PWD/../../external-deps/openal/lib/linux/x64/ -lopenal
-unix:!macx: LIBS += -L$$PWD/../../external-deps/glew/lib/linux/x64/ -lGLEW
-unix:!macx: LIBS += -lGL
-unix:!macx: LIBS += -lrt
-unix:!macx: LIBS += -ldl
-unix:!macx: LIBS += -lX11
-unix:!macx: LIBS += -lpthread
-unix:!macx: LIBS += -lgtk-x11-2.0
-unix:!macx: LIBS += -lglib-2.0
-unix:!macx: LIBS += -lgobject-2.0
+linux:!android: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
 
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libLinearMath.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletCollision.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/ogg/lib/linux/x64/libogg.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/vorbis/lib/linux/x64/libvorbis.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/openal/lib/linux/x64/libopenal.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/../../external-deps/glew/lib/linux/x64/libGLEW.a
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}

+ 51 - 56
template/TEMPLATE_PROJECT.pro

@@ -21,65 +21,60 @@ INCLUDEPATH += GAMEPLAY_PATH/external-deps/zlib/include
 INCLUDEPATH += GAMEPLAY_PATH/external-deps/ogg/include
 INCLUDEPATH += GAMEPLAY_PATH/external-deps/vorbis/include
 INCLUDEPATH += GAMEPLAY_PATH/external-deps/openal/include
-INCLUDEPATH += GAMEPLAY_PATH/external-deps/glew/include
-INCLUDEPATH += /usr/include/gtk-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
-INCLUDEPATH += /usr/include/atk-1.0
-INCLUDEPATH += /usr/include/cairo
-INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
-INCLUDEPATH += /usr/include/pango-1.0
-INCLUDEPATH += /usr/include/gio-unix-2.0
-INCLUDEPATH += /usr/include/freetype2
-INCLUDEPATH += /usr/include/glib-2.0
-INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
-INCLUDEPATH += /usr/include/pixman-1
-INCLUDEPATH += /usr/include/libpng12
-INCLUDEPATH += /usr/include/harfbuzz
+linux:!android: INCLUDEPATH += GAMEPLAY_PATH/external-deps/glew/include
+linux:!android: INCLUDEPATH += /usr/include/gtk-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/atk-1.0
+linux:!android: INCLUDEPATH += /usr/include/cairo
+linux:!android: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
+linux:!android: INCLUDEPATH += /usr/include/pango-1.0
+linux:!android: INCLUDEPATH += /usr/include/gio-unix-2.0
+linux:!android: INCLUDEPATH += /usr/include/freetype2
+linux:!android: INCLUDEPATH += /usr/include/glib-2.0
+linux:!android: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
+linux:!android: INCLUDEPATH += /usr/include/pixman-1
+linux:!android: INCLUDEPATH += /usr/include/libpng12
+linux:!android: INCLUDEPATH += /usr/include/harfbuzz
 DEPENDPATH += INCLUDEPATH
 
-DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += GP_USE_GAMEPAD
+linux:!android: DEFINES += __linux__
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 
-unix:!macx: DEFINES += __linux__
-unix:!macx: QMAKE_CXXFLAGS += -fPIC -fmessage-length=0 -std=c++11 -lstdc++ -pthread -w
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/gameplay/Debug/ -lgameplay
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/vorbis/lib/linux/x64/ -lvorbis
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/ogg/lib/linux/x64/ -logg
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/ -lBulletDynamics
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/ -lBulletCollision
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/ -lLinearMath
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/openal/lib/linux/x64/ -lopenal
+linux:!android: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/glew/lib/linux/x64/ -lGLEW
+linux:!android: LIBS += -lm
+linux:!android: LIBS += -lGL
+linux:!android: LIBS += -lrt
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lX11
+linux:!android: LIBS += -lpthread
+linux:!android: LIBS += -lgtk-x11-2.0
+linux:!android: LIBS += -lglib-2.0
+linux:!android: LIBS += -lgobject-2.0
 
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/gameplay/Debug/ -lgameplay
-unix:!macx: LIBS += -lm
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/lua/lib/linux/x64/ -llua
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/png/lib/linux/x64/ -lpng
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/zlib/lib/linux/x64/ -lz
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/vorbis/lib/linux/x64/ -lvorbis
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/ogg/lib/linux/x64/ -logg
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/ -lBulletDynamics
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/ -lBulletCollision
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/ -lLinearMath
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/openal/lib/linux/x64/ -lopenal
-unix:!macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/glew/lib/linux/x64/ -lGLEW
-unix:!macx: LIBS += -lGL
-unix:!macx: LIBS += -lrt
-unix:!macx: LIBS += -ldl
-unix:!macx: LIBS += -lX11
-unix:!macx: LIBS += -lpthread
-unix:!macx: LIBS += -lgtk-x11-2.0
-unix:!macx: LIBS += -lglib-2.0
-unix:!macx: LIBS += -lgobject-2.0
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/gameplay/Debug/libgameplay.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/libLinearMath.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/libBulletCollision.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/libBulletDynamics.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/ogg/lib/linux/x64/libogg.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/vorbis/lib/linux/x64/libvorbis.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/openal/lib/linux/x64/libopenal.a
+linux:!android: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/glew/lib/linux/x64/libGLEW.a
 
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/gameplay/Debug/libgameplay.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/lua/lib/linux/x64/liblua.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/libLinearMath.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/libBulletCollision.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/bullet/lib/linux/x64/libBulletDynamics.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/png/lib/linux/x64/libpng.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/zlib/lib/linux/x64/libz.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/ogg/lib/linux/x64/libogg.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/vorbis/lib/linux/x64/libvorbis.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/openal/lib/linux/x64/libopenal.a
-unix:!macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/glew/lib/linux/x64/libGLEW.a
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/GAMEPLAY_PATH/gameplay/res/shaders ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/GAMEPLAY_PATH/gameplay/res/ui ../res$$escape_expand(\n\t))
+linux:!android: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/GAMEPLAY_PATH/gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/GAMEPLAY_PATH/gameplay/res/shaders ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/GAMEPLAY_PATH/gameplay/res/ui ../res$$escape_expand(\n\t))
-unix:!macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/GAMEPLAY_PATH/gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-
-unix {
-    target.path = /usr/lib
-    INSTALLS += target
-}

+ 3 - 1
tools/encoder/CMakeLists.txt

@@ -7,7 +7,9 @@ include_directories(
     /usr/include
 )
 
+if ( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
 add_definitions(-D_DEBUG)
+endif()
 add_definitions(-D__linux__ -DUSE_FBX)
 
 link_directories(
@@ -32,6 +34,7 @@ add_definitions(-lstdc++ -ldl -lfbxsdk -lpng -lz -lfreetype -lpthread)
 set( APP_NAME gameplay-encoder )
 
 set(APP_SRC
+    src/main.cpp
     src/AnimationChannel.cpp
     src/AnimationChannel.h
     src/Animation.cpp
@@ -75,7 +78,6 @@ set(APP_SRC
     src/Image.h
     src/Light.cpp
     src/Light.h
-    src/main.cpp
     src/Material.cpp
     src/Material.h
     src/MaterialParameter.cpp

+ 138 - 0
tools/encoder/gameplay-encoder.pro

@@ -0,0 +1,138 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator
+#
+#-------------------------------------------------
+
+QT       -= core gui
+
+TARGET = gameplay-encoder
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+SOURCES += src/Mesh.cpp \
+    src/AnimationChannel.cpp \
+    src/Animation.cpp \
+    src/Animations.cpp \
+    src/Base.cpp \
+    src/BoundingVolume.cpp \
+    src/Camera.cpp \
+    src/Constants.cpp \
+    src/Curve.cpp \
+    src/edtaa3func.c \
+    src/Effect.cpp \
+    src/EncoderArguments.cpp \
+    src/FBXSceneEncoder.cpp \
+    src/FBXUtil.cpp \
+    src/FileIO.cpp \
+    src/Font.cpp \
+    src/Glyph.cpp \
+    src/GPBDecoder.cpp \
+    src/GPBFile.cpp \
+    src/Heightmap.cpp \
+    src/Image.cpp \
+    src/Light.cpp \
+    src/main.cpp \
+    src/Material.cpp \
+    src/MaterialParameter.cpp \
+    src/Matrix.cpp \
+    src/MeshPart.cpp \
+    src/MeshSkin.cpp \
+    src/MeshSubSet.cpp \
+    src/Model.cpp \
+    src/Node.cpp \
+    src/NormalMapGenerator.cpp \
+    src/Object.cpp \
+    src/Quaternion.cpp \
+    src/Reference.cpp \
+    src/ReferenceTable.cpp \
+    src/Sampler.cpp \
+    src/Scene.cpp \
+    src/StringUtil.cpp \
+    src/Transform.cpp \
+    src/TTFFontEncoder.cpp \
+    src/Vector2.cpp \
+    src/Vector3.cpp \
+    src/Vector4.cpp \
+    src/Vertex.cpp \
+    src/VertexElement.cpp
+
+HEADERS += src/AnimationChannel.h \
+    src/AnimationChannel.h \
+    src/Animation.h \
+    src/Animations.h \
+    src/Base.h \
+    src/BoundingVolume.h \
+    src/Camera.h \
+    src/Constants.h \
+    src/Curve.h \
+    src/Curve.inl \
+    src/edtaa3func.h \
+    src/Effect.h \
+    src/EncoderArguments.h \
+    src/FBXSceneEncoder.h \
+    src/FBXUtil.h \
+    src/FileIO.h \
+    src/Font.h \
+    src/Glyph.h \
+    src/GPBDecoder.h \
+    src/GPBFile.h \
+    src/Heightmap.h \
+    src/Image.h \
+    src/Light.h \
+    src/Material.h \
+    src/MaterialParameter.h \
+    src/Matrix.h \
+    src/Mesh.h \
+    src/MeshPart.h \
+    src/MeshSkin.h \
+    src/MeshSubSet.h \
+    src/Model.h \
+    src/Node.h \
+    src/NormalMapGenerator.h \
+    src/Object.h \
+    src/Quaternion.h \
+    src/Quaternion.inl \
+    src/Reference.h \
+    src/ReferenceTable.h \
+    src/Sampler.h \
+    src/Scene.h \
+    src/StringUtil.h \
+    src/Thread.h \
+    src/Transform.h \
+    src/TTFFontEncoder.h \
+    src/Vector2.h \
+    src/Vector2.inl \
+    src/Vector3.h \
+    src/Vector3.inl \
+    src/Vector4.h \
+    src/Vector4.inl \
+    src/VertexElement.h \
+    src/Vertex.h
+
+INCLUDEPATH += $$PWD/../../external-deps/png/include
+INCLUDEPATH += $$PWD/../../external-deps/zlib/include
+INCLUDEPATH += $$PWD/../../external-deps/freetype2/include
+linux:!android: INCLUDEPATH += /usr/include/fbxsdk
+linux:!android: INCLUDEPATH += /usr/include
+
+DEPENDPATH += INCLUDEPATH
+
+linux:!android: DEFINES += USE_FBX
+linux:!android: DEFINES += __linux__
+
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+
+linux:!android: LIBS += -L$$PWD/../../external-deps/png/lib/linux/x64/ -lpng
+linux:!android: LIBS += -L$$PWD/../../external-deps/zlib/lib/linux/x64/ -lz
+linux:!android: LIBS += -L$$PWD/../../external-deps/freetype2/lib/linux/x64/ -lfreetype
+linux:!android: LIBS += -L/usr/lib/gcc4/x64/release -lfbxsdk
+linux:!android: LIBS += -lstdc++
+linux:!android: LIBS += -ldl
+linux:!android: LIBS += -lpthread
+
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/png/lib/linux/x64/libpng.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/zlib/lib/linux/x64/libz.a
+linux:!android: PRE_TARGETDEPS += /usr/lib/gcc4/x64/release/libfbxsdk.a

+ 1 - 1
tools/luagen/CMakeLists.txt

@@ -23,6 +23,7 @@ add_definitions(-lstdc++ -llua -ltinyxml2)
 set( APP_NAME gameplay-luagen )
 
 set(APP_SRC
+    src/main.cpp
     src/Base.h
     src/ClassBinding.cpp
     src/ClassBinding.h
@@ -33,7 +34,6 @@ set(APP_SRC
     src/FunctionBinding.h
     src/Generator.cpp
     src/Generator.h
-    src/main.cpp
     src/TypedefBinding.h
 )
 

+ 45 - 0
tools/luagen/gameplay-luagen.pro

@@ -0,0 +1,45 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator
+#
+#-------------------------------------------------
+
+QT       -= core gui
+
+TARGET = gameplay-luagen
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+SOURCES += src/main.cpp \
+    src/ClassBinding.cpp \
+    src/DebugNew.cpp \
+    src/FunctionBinding.cpp \
+    src/Generator.cpp
+
+
+HEADERS += src/Base.h \
+    src/ClassBinding.h \
+    src/DebugNew.h \
+    src/EnumBinding.h \
+    src/FunctionBinding.h \
+    src/Generator.h \
+    src/TypedefBinding.h
+
+INCLUDEPATH += $$PWD/../../external-deps/lua/include
+INCLUDEPATH += $$PWD/../../external-deps/tinyxml2/include
+
+DEPENDPATH += INCLUDEPATH
+
+linux:!android: DEFINES += __linux__
+
+linux:!android: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
+
+linux:!android: LIBS += -L$$PWD/../../external-deps/lua/lib/linux/x64/ -llua
+linux:!android: LIBS += -L$$PWD/../../external-deps/tinyxml2/lib/linux/x64/ -ltinyxml2
+linux:!android: LIBS += -lstdc++
+
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/lua/lib/linux/x64/liblua.a
+linux:!android: PRE_TARGETDEPS += $$PWD/../../external-deps/tinyxml2/lib/linux/x64/libtinyxml2.a
+

+ 8 - 8
tools/luagen/src/DebugNew.cpp

@@ -46,42 +46,42 @@ void* operator new[] (std::size_t size, const char* file, int line)
     return operator new (size, file, line);
 }
 
-void* operator new (std::size_t size) throw(std::bad_alloc)
+void* operator new (std::size_t size)
 {
     return operator new (size, "", 0);
 }
 
-void* operator new[] (std::size_t size) throw(std::bad_alloc)
+void* operator new[] (std::size_t size)
 {
     return operator new (size, "", 0);
 }
 
-void* operator new (std::size_t size, const std::nothrow_t&) throw()
+void* operator new (std::size_t size, const std::nothrow_t& nothrow_value) noexcept
 {
     return operator new (size, "", 0);
 }
 
-void* operator new[] (std::size_t size, const std::nothrow_t&) throw()
+void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_value) noexcept
 {
     return operator new (size, "", 0);
 }
 
-void operator delete (void* p) throw()
+void operator delete (void* p) noexcept
 {
     debugFree(p);
 }
 
-void operator delete[] (void* p) throw()
+void operator delete[] (void* p) noexcept
 {
     operator delete (p);
 }
 
-void operator delete (void* p, const char* file, int line) throw()
+void operator delete (void* p, const char* file, int line) noexcept
 {
     operator delete (p);
 }
 
-void operator delete[] (void* p, const char* file, int line) throw()
+void operator delete[] (void* p, const char* file, int line) noexcept
 {
     operator delete (p);
 }

+ 8 - 8
tools/luagen/src/DebugNew.h

@@ -16,14 +16,14 @@ extern void printMemoryLeaks();
 #endif
 void* operator new (std::size_t size, const char* file, int line);
 void* operator new[] (std::size_t size, const char* file, int line);
-void* operator new (std::size_t size) throw(std::bad_alloc);
-void* operator new[] (std::size_t size) throw(std::bad_alloc);
-void* operator new (std::size_t size, const std::nothrow_t&) throw();
-void* operator new[] (std::size_t size, const std::nothrow_t&) throw();
-void operator delete (void* p) throw();
-void operator delete[] (void* p) throw();
-void operator delete (void* p, const char* file, int line) throw();
-void operator delete[] (void* p, const char* file, int line) throw();
+void* operator new (std::size_t size);
+void* operator new[] (std::size_t size);
+void* operator new (std::size_t size, const std::nothrow_t& nothrow_value) noexcept;
+void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_value) noexcept;
+void operator delete (void* p) noexcept;
+void operator delete[] (void* p) noexcept;
+void operator delete (void* p, const char* file, int line) noexcept;
+void operator delete[] (void* p, const char* file, int line) noexcept;
 #ifdef _MSC_VER
 #pragma warning( default : 4290 )
 #endif