Merge pull request woodenshark#47 from psieg/osx

OS X build adaptations

Author: psieg

.travis.yml

@@ -0,0 +1,26 @@
+language: cpp
+#language: objective-c
+
+notifications:
+  email: false
+
+os:
+  - osx
+  
+before_install:
+  - brew update
+  - brew install qt5
+  - export QTDIR=/usr/local/opt/qt5/
+  - export PATH=$PATH:$QTDIR/bin
+  - export VERSION=`cat Software/VERSION`
+  - qmake -v
+
+script:
+  - export QMAKE_MAC_SDK=macosx10.8
+  - cd Software
+  - ./update_locales.sh
+  - qmake -r
+  - make
+  - macdeployqt bin/Prismatik.app -dmg
+  - ls bin
+  - curl -T bin/Prismatik.dmg "https://psieg.de/lightpack/osx_builds/Prismatik_${VERSION}_${TRAVIS_BUILD_NUMBER}.dmg" -u "${PSIEG_UPLOAD_USER}:${PSIEG_UPLOAD_PASSWORD}"

Software/build-vars.prf.default

@@ -21,6 +21,8 @@ win32: {
     TARGET_ARCH = x86_64
 }
 
+# For Qt lrelease reasons, to change the MAC SDK, you have to edit src.pro directly
+# When using variables, lrelease complains about QMAKE_MAC_SDK not being set
 # You can override QMAKE_MAC_SDK value by setting this variable.
 # macx {
 #     QMAKE_MAC_SDK_OVERRIDE = macosx10.8

Software/src/src.pro

@@ -50,9 +50,6 @@ TRANSLATIONS += ../res/translations/ru_RU.ts \
 RESOURCES    = ../res/LightpackResources.qrc
 RC_FILE      = ../res/Lightpack.rc
 
-# Generate .qm language files
-system($$[QT_INSTALL_BINS]/lrelease src.pro)
-
 include(../build-config.prf)
 
 # Grabber types configuration
@@ -172,20 +169,25 @@ macx{
 
     QMAKE_INFO_PLIST = ./Info.plist
 
-    isEmpty( QMAKE_MAC_SDK_OVERRIDE ) {
-        # Default value
-        # For build universal binaries (native on Intel and PowerPC)
-        QMAKE_MAC_SDK = macosx10.9
-    } else {
-        message( "Overriding default QMAKE_MAC_SDK with value $${QMAKE_MAC_SDK_OVERRIDE}" )
-        QMAKE_MAC_SDK = $${QMAKE_MAC_SDK_OVERRIDE}
-    }
+	#see build-vars.prf
+    #isEmpty( QMAKE_MAC_SDK_OVERRIDE ) {
+    #    # Default value
+    #    # For build universal binaries (native on Intel and PowerPC)
+    #    QMAKE_MAC_SDK = macosx10.9
+    #} else {
+    #    message( "Overriding default QMAKE_MAC_SDK with value $${QMAKE_MAC_SDK_OVERRIDE}" )
+    #    QMAKE_MAC_SDK = $${QMAKE_MAC_SDK_OVERRIDE}
+    #}
 
     CONFIG(clang) {
-        QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 -stdlib=libstdc++ -x objective-c++
+        QMAKE_CXXFLAGS += -mmacosx-version-min=10.6 -x objective-c++
     }
 }
 
+# Generate .qm language files
+QMAKE_MAC_SDK = macosx10.9
+system($$[QT_INSTALL_BINS]/lrelease src.pro)
+
 INCLUDEPATH += . \
                .. \
                ./hidapi \

Software/update_locales.bat

@@ -25,7 +25,5 @@ echo.
 
 echo.
 
-pause
-
 exit 0
 

Software/update_locales.sh

@@ -29,6 +29,7 @@ echo "================================================="
 echo "Updating translation files for Lightpack project:"
 echo 
 lupdate $1 src/src.pro
+echo "done"
 
 echo 
 echo "==========================================================="
@@ -37,9 +38,6 @@ echo
 lrelease src/src.pro
 
 echo
-echo Press enter to exit...
-
-read
 
 exit 0