Merge branch 'next' of github.com:gameplay3d/GamePlay into upstream

Conflicts:
	gameplay/gameplay.pro
	samples/browser/sample-browser.pro
	samples/character/sample-character.pro
	samples/racer/sample-racer.pro
	samples/spaceship/sample-spaceship.pro

gameplay/gameplay.pro

@@ -507,15 +507,17 @@ HEADERS += src/AbsoluteLayout.h \
     src/lua/lua_VertexFormatElement.h \
     src/lua/lua_VerticalLayout.h
 
-DEFINES += GP_USE_GAMEPAD
+CONFIG += c++11
+
 INCLUDEPATH += $$PWD/../gameplay/src
 INCLUDEPATH += $$PWD/../external-deps/include
 
 # linux
 linux: SOURCES += src/PlatformLinux.cpp
-linux:: SORCES += src/gameplay-main-linux.cpp
+linux: SOURCES += src/gameplay-main-linux.cpp
+linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
+linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
-linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux: INCLUDEPATH += /usr/include/gtk-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
 linux: INCLUDEPATH += /usr/include/atk-1.0
@@ -533,8 +535,9 @@ linux: INCLUDEPATH += /usr/include/harfbuzz
 # macosx
 macx: OBJECTIVE_SOURCES += src/PlatformMacOSX.mm
 macx: OBJECTIVE_SOURCES += src/gameplay-main-macosx.mm
-macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64 -v
-macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64 -v
+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: DEFINES += GP_USE_GAMEPAD
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit

samples/browser/sample-browser.pro

@@ -61,14 +61,16 @@ HEADERS += src/Audio3DSample.h \
     src/TriangleSample.h \
     src/WaterSample.h
 
-DEFINES += GP_USE_GAMEPAD
+CONFIG += c++11
+
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
 LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 
+linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
+linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
-linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux: INCLUDEPATH += /usr/include/gtk-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
 linux: INCLUDEPATH += /usr/include/atk-1.0
@@ -97,8 +99,9 @@ linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ..
 linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
 linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
-macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+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: DEFINES += GP_USE_GAMEPAD
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -109,4 +112,18 @@ 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.files = icon.png
+    icon.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += icon
+
+    gameconfig.files = game.config
+    gameconfig.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += gameconfig
+
+    res.files = res
+    res.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += res
+}
 

samples/character/sample-character.pro

@@ -13,14 +13,16 @@ SOURCES += src/CharacterGame.cpp
 
 HEADERS += src/CharacterGame.h 
 
-DEFINES += GP_USE_GAMEPAD
+CONFIG += c++11
+
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
 LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 
+linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
+linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
-linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux: INCLUDEPATH += /usr/include/gtk-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
 linux: INCLUDEPATH += /usr/include/atk-1.0
@@ -49,8 +51,9 @@ linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ..
 linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
 linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
-macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+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: DEFINES += GP_USE_GAMEPAD
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -61,4 +64,17 @@ 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.files = icon.png
+    icon.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += icon
+
+    gameconfig.files = game.config
+    gameconfig.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += gameconfig
 
+    res.files = res
+    res.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += res
+}

samples/racer/sample-racer.pro

@@ -13,14 +13,15 @@ SOURCES += src/RacerGame.cpp
 
 HEADERS += src/RacerGame.h 
 
-DEFINES += GP_USE_GAMEPAD
+CONFIG += c++11
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
 LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 
+linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
+linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
-linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux: INCLUDEPATH += /usr/include/gtk-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
 linux: INCLUDEPATH += /usr/include/atk-1.0
@@ -49,8 +50,9 @@ linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ..
 linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
 linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
-macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+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: DEFINES += GP_USE_GAMEPAD
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -61,3 +63,18 @@ 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(\n\t))
+macx
+{
+    icon.files = icon.png
+    icon.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += icon
+
+    gameconfig.files = game.config
+    gameconfig.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += gameconfig
+
+    res.files = res
+    res.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += res
+}

samples/racer/sample-racer.xcodeproj/project.pbxproj

@@ -16,7 +16,6 @@
 		42C9331D1491A6750098216A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9331C1491A6750098216A /* QuartzCore.framework */; };
 		42C9331F1491A67F0098216A /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42C9331E1491A67F0098216A /* OpenAL.framework */; };
 		42CD5E8816ADB34000C1D49D /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 42CD5E8716ADB34000C1D49D /* [email protected] */; };
-		42D604DF16058F89003F3C48 /* game.dxt.config in Resources */ = {isa = PBXBuildFile; fileRef = 42D604DE16058F89003F3C48 /* game.dxt.config */; };
 		42D604E216058F97003F3C48 /* game.pvr.config in Resources */ = {isa = PBXBuildFile; fileRef = 42D604E116058F97003F3C48 /* game.pvr.config */; };
 		42DFAACF16AD8A160000F342 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAACE16AD8A160000F342 /* CoreMotion.framework */; };
 		42DFAAE216AD8B140000F342 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42DFAAE116AD8B140000F342 /* Foundation.framework */; };
@@ -250,9 +249,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				42C932EE1491A4CB0098216A /* icon.png in Resources */,
-				42C932F31491A53E0098216A /* res in Resources */,
 				F188C94B15C1971F0025FC73 /* game.config in Resources */,
-				42D604DF16058F89003F3C48 /* game.dxt.config in Resources */,
+				42C932F31491A53E0098216A /* res in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

samples/spaceship/sample-spaceship.pro

@@ -13,14 +13,16 @@ SOURCES += src/SpaceshipGame.cpp
 
 HEADERS += src/SpaceshipGame.h 
 
-DEFINES += GP_USE_GAMEPAD
+CONFIG += c++11
+
 INCLUDEPATH += $$PWD/../../gameplay/src
 INCLUDEPATH += $$PWD/../../external-deps/include
 LIBS += -L$$PWD/../../gameplay/Debug/ -lgameplay
 PRE_TARGETDEPS += $$PWD/../../gameplay/Debug/libgameplay.a
 
+linux: QMAKE_CXXFLAGS += -lstdc++ -pthread -w
+linux: DEFINES += GP_USE_GAMEPAD
 linux: DEFINES += __linux__
-linux: QMAKE_CXXFLAGS += -std=c++11 -lstdc++ -pthread -w
 linux: INCLUDEPATH += /usr/include/gtk-2.0
 linux: INCLUDEPATH += /usr/lib/x86_64-linux-gnu/gtk-2.0/include
 linux: INCLUDEPATH += /usr/include/atk-1.0
@@ -49,8 +51,9 @@ linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/shaders ..
 linux: QMAKE_POST_LINK += $$quote(rsync -rau $$PWD/../../gameplay/res/ui ../res$$escape_expand(\n\t))
 linux: QMAKE_POST_LINK += $$quote(cp -rf $$PWD/../../gameplay/res/logo_powered_white.png ../res$$escape_expand(\n\t))
 
-macx: QMAKE_CXXFLAGS += -x c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
-macx: QMAKE_OBJECTIVE_CFLAGS += -x objective-c++ -std=c++11 -stdlib=libc++ -w -arch x86_64
+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: DEFINES += GP_USE_GAMEPAD
 macx: LIBS += -L$$PWD/../../external-deps/lib/macosx/x86_64/ -lgameplay-deps
 macx: LIBS += -F/System/Library/Frameworks -framework GameKit
 macx: LIBS += -F/System/Library/Frameworks -framework IOKit
@@ -61,3 +64,17 @@ 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.files = icon.png
+    icon.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += icon
+
+    gameconfig.files = game.config
+    gameconfig.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += gameconfig
+
+    res.files = res
+    res.path = Contents/Resources
+    QMAKE_BUNDLE_DATA += res
+}