Forráskód Böngészése

Updates to QTCreator project files

seanpaultaylor 11 éve
szülő
commit
d0a12f452e

+ 0 - 2
.gitignore

@@ -81,7 +81,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/character/Debug
 /samples/character/DebugMem
 /samples/character/Release
-/samples/character/game.config
 /samples/character/res/shaders
 /samples/character/res/ui
 /samples/character/res/logo_powered_white.png
@@ -103,7 +102,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/racer/Debug
 /samples/racer/DebugMem
 /samples/racer/Release
-/samples/racer/game.config
 /samples/racer/res/shaders
 /samples/racer/res/ui
 /samples/racer/res/logo_powered_white.png

+ 1 - 4
samples/browser/sample-browser.pro

@@ -77,8 +77,6 @@ linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
 linux: INCLUDEPATH += /usr/include/pango-1.0
 linux: INCLUDEPATH += /usr/include/gio-unix-2.0
 linux: INCLUDEPATH += /usr/include/freetype2
-linux: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/linux/x86_64/libgameplay-deps.a
 linux: INCLUDEPATH += /usr/include/glib-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
 linux: INCLUDEPATH += /usr/include/pixman-1
@@ -93,8 +91,6 @@ linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_w
 
 macx: QMAKE_CXXFLAGS += -x c++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/macosx/x86_64/libgameplay-deps.a
 macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
@@ -106,6 +102,7 @@ macx: LIBS += -F/System/Library/Frameworks -framework Cocoa
 macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
 macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
 macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
+macx: ICON = icon.png
 macx 
 {
     icon.files = icon.png

+ 48 - 0
samples/character/game.config

@@ -0,0 +1,48 @@
+window
+{
+    title = Character
+    width = 1280
+    height = 720
+    fullscreen = false
+}
+
+aliases
+{
+    backboard = res/dxt/backboard.dds
+    basketball = res/dxt/basketball.dds
+    basketballnet = res/dxt/basketballnet.dds
+    book = res/dxt/book.dds
+    bookshelf = res/dxt/bookshelf.dds
+    character = res/dxt/boy.dds
+    decals = res/dxt/decals.dds
+    door = res/dxt/door.dds
+    doorframe = res/dxt/doorframe.dds
+    easel = res/dxt/easel.dds
+    floor = res/dxt/floor.dds
+    floortiles = res/dxt/floortiles.dds
+    gamepad = res/dxt/gamepad.dds
+    playtable = res/dxt/playtable.dds
+    shadow = res/dxt/shadow.dds
+    storageorganizer = res/dxt/storageorganizer.dds
+    tableleg1 = res/dxt/tableleg1.dds
+    tableleg2 = res/dxt/tableleg2.dds
+    tableleg3 = res/dxt/tableleg3.dds
+    tableleg4 = res/dxt/tableleg4.dds
+    tabletop = res/dxt/tabletop.dds
+    tiles = res/dxt/tiles.dds
+    tilesn = res/dxt/tilesn.dds
+    toybox = res/dxt/toybox.dds
+    walleast = res/dxt/walleast.dds
+    wallnorth = res/dxt/wallnorth.dds
+    walloverhang = res/dxt/walloverhang.dds
+    wallsouth = res/dxt/wallsouth.dds
+    wallwest = res/dxt/wallwest.dds
+    windowledge = res/dxt/windowledge.dds
+    wood = res/dxt/wood.dds
+    woodn = res/dxt/woodn.dds
+}
+
+gamepads
+{
+    form = res/common/gamepad.form
+}

+ 2 - 7
samples/character/sample-character.pro

@@ -27,8 +27,6 @@ linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
 linux: INCLUDEPATH += /usr/include/pango-1.0
 linux: INCLUDEPATH += /usr/include/gio-unix-2.0
 linux: INCLUDEPATH += /usr/include/freetype2
-linux: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/linux/x86_64/libgameplay-deps.a
 linux: INCLUDEPATH += /usr/include/glib-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
 linux: INCLUDEPATH += /usr/include/pixman-1
@@ -44,8 +42,6 @@ linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config game.config$$esca
 
 macx: QMAKE_CXXFLAGS += -x c++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/macosx/x86_64/libgameplay-deps.a
 macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
@@ -54,11 +50,10 @@ macx: LIBS += -F/System/Library/Frameworks -framework QuartzCore
 macx: LIBS += -F/System/Library/Frameworks -framework OpenAL
 macx: LIBS += -F/System/Library/Frameworks -framework OpenGL
 macx: LIBS += -F/System/Library/Frameworks -framework Cocoa
-macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
+macx: QMAKE_ += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
 macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
 macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config game.config$$escape_expand(\n\t))
-macx 
+macx
 {
     icon.files = icon.png
     icon.path = Contents/Resources

+ 72 - 0
samples/racer/game.config

@@ -0,0 +1,72 @@
+window
+{
+    title = Racer
+    width = 1280
+    height = 720
+    fullscreen = false
+}
+
+scripts
+{
+    initialize = res/common/racer.lua#initialize
+    update = res/common/racer.lua#update
+    render = res/common/racer.lua#render
+    finalize = res/common/racer.lua#finalize
+    keyEvent = res/common/racer.lua#keyEvent
+    touchEvent = res/common/racer.lua#touchEvent
+}
+
+aliases 
+{
+    car = res/dxt/car.png
+    chain_fence_1 = res/dxt/chain_fence_1.dds 
+    design_11 = res/dxt/design_11.dds 
+    d_tree = res/dxt/d_tree.dds 
+    gamepad = res/dxt/gamepad.dds 
+    grassbunch_1 = res/dxt/grassbunch_1.dds 
+    grassbunch_2 = res/dxt/grassbunch_2.dds 
+    gravel_2 = res/dxt/gravel_2.dds 
+    panel_1 = res/dxt/panel_1.dds 
+    panel_10 = res/dxt/panel_10.dds 
+    panel_11 = res/dxt/panel_11.dds 
+    panel_12 = res/dxt/panel_12.dds 
+    panel_13 = res/dxt/panel_13.dds 
+    panel_14 = res/dxt/panel_14.dds 
+    panel_15 = res/dxt/panel_15.dds 
+    panel_16 = res/dxt/panel_16.dds 
+    panel_2 = res/dxt/panel_2.dds 
+    panel_3 = res/dxt/panel_3.dds 
+    panel_4 = res/dxt/panel_4.dds 
+    panel_5 = res/dxt/panel_5.dds 
+    panel_6 = res/dxt/panel_6.dds 
+    panel_7 = res/dxt/panel_7.dds 
+    panel_8 = res/dxt/panel_8.dds 
+    panel_9 = res/dxt/panel_9.dds 
+    panorama_2 = res/dxt/panorama_2.dds 
+    panorama_3 = res/dxt/panorama_3.dds 
+    rails = res/dxt/rails.dds 
+    shrub_1 = res/dxt/shrub_1.dds 
+    shrub_2 = res/dxt/shrub_2.dds 
+    shrub_3 = res/dxt/shrub_3.dds 
+    textures_8 = res/dxt/textures_8.dds 
+    track_1 = res/dxt/track_1.dds 
+    tree = res/dxt/tree.dds 
+    tree_2 = res/dxt/tree_2.dds 
+    tree_3 = res/dxt/tree_3.dds 
+    tree_4 = res/dxt/tree_4.dds 
+    tree_5 = res/dxt/tree_5.dds 
+    tree_6 = res/dxt/tree_6.dds 
+    tree_7 = res/dxt/tree_7.dds 
+    trunk_1 = res/dxt/trunk_1.dds 
+    trunk_2 = res/dxt/trunk_2.dds 
+} 
+
+gamepad
+{
+    form = res/common/gamepad.form
+}
+
+ui
+{
+    theme = res/ui/default.theme
+}

+ 0 - 5
samples/racer/sample-racer.pro

@@ -27,8 +27,6 @@ linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
 linux: INCLUDEPATH += /usr/include/pango-1.0
 linux: INCLUDEPATH += /usr/include/gio-unix-2.0
 linux: INCLUDEPATH += /usr/include/freetype2
-linux: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/linux/x86_64/libgameplay-deps.a
 linux: INCLUDEPATH += /usr/include/glib-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
 linux: INCLUDEPATH += /usr/include/pixman-1
@@ -44,8 +42,6 @@ linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config game.config$$esca
 
 macx: QMAKE_CXXFLAGS += -x c++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/macosx/x86_64/libgameplay-deps.a
 macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
@@ -57,7 +53,6 @@ macx: LIBS += -F/System/Library/Frameworks -framework Cocoa
 macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ../res$$escape_expand(\n\t))
 macx: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
 macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
-macx: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/game.dxt.config game.config$$escape_expand(\n\t))
 macx 
 {
     icon.files = icon.png

+ 0 - 4
samples/spaceship/sample-spaceship.pro

@@ -27,8 +27,6 @@ linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
 linux: INCLUDEPATH += /usr/include/pango-1.0
 linux: INCLUDEPATH += /usr/include/gio-unix-2.0
 linux: INCLUDEPATH += /usr/include/freetype2
-linux: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-linux: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/linux/x86_64/libgameplay-deps.a
 linux: INCLUDEPATH += /usr/include/glib-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
 linux: INCLUDEPATH += /usr/include/pixman-1
@@ -43,8 +41,6 @@ linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_w
 
 macx: QMAKE_CXXFLAGS += -x c++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
-macx: PRE_TARGETDEPS += $$PWD/../../external-deps/lib/macosx/x86_64/libgameplay-deps.a
 macx: LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit

+ 0 - 4
template/TEMPLATE_PROJECT.pro

@@ -27,8 +27,6 @@ linux: INCLUDEPATH += /usr/include/gdk-pixbuf-2.0
 linux: INCLUDEPATH += /usr/include/pango-1.0
 linux: INCLUDEPATH += /usr/include/gio-unix-2.0
 linux: INCLUDEPATH += /usr/include/freetype2
-linux: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/gameplay/Debug/libgameplay.a
-linux: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/lib/linux/x86_64/libgameplay-deps.a
 linux: INCLUDEPATH += /usr/include/glib-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/glib-2.0/include
 linux: INCLUDEPATH += /usr/include/pixman-1
@@ -43,8 +41,6 @@ linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/GAMEPLAY_PATH/gameplay/res/logo_p
 
 macx: QMAKE_CXXFLAGS += -x c++ -stdlib=libc++ -w -arch x86_64
 macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -stdlib=libc++ -w -arch x86_64
-macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/gameplay/Debug/libgameplay.a
-macx: PRE_TARGETDEPS += $$PWD/GAMEPLAY_PATH/external-deps/lib/macosx/x86_64/libgameplay-deps.a
 macx: LIBS += -L$$PWD/GAMEPLAY_PATH/gameplay/Debug/ -lgameplay
 macx: LIBS += -L$$PWD/GAMEPLAY_PATH/external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit