From bfeeaeabfb8957d7ad4e4b73bebb5fc3e24cf63d Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 30 Aug 2015 17:27:19 +0200 Subject: [PATCH] replaced .travis.yml for easier test and added the iOS makefile --- .travis.yml | 64 +++--------- projects/mtg/iOS/Makefile | 201 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 215 insertions(+), 50 deletions(-) create mode 100644 projects/mtg/iOS/Makefile diff --git a/.travis.yml b/.travis.yml index 7c3c5011d..eea629472 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,60 +1,24 @@ -language: cpp -branches: - except: - - latest-master +language: objective-c before_install: - - export BUILD_PSP=YES - - export BUILD_ANDROID=YES - - export BUILD_Qt=YES - - export BUILD_MAC=YES - - sudo apt-get update -qq -# Building for PSP here - - if [ "$BUILD_PSP" == "YES" ]; then - export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" && - export PSPSDK="$PSPDEV/psp/sdk" && - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" && - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download; - fi -# Building for Android here - - if [ "$BUILD_ANDROID" == "YES" ]; then - export ANDROID="android-sdk-linux/tools/android" && - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi && - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv && - wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz -nv; - fi -# Building for Qt here - - if [ "$BUILD_Qt" == "YES" ]; then - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa && - sudo apt-get update -qq && - sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev && - export QMAKE="qmake -qt=qt5"; - fi - -install: -- if [ "$BUILD_PSP" == "YES" ]; then - tar -x --xz -f sdk.lzma; - fi -- if [ "$BUILD_ANDROID" == "YES" ]; then - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && - tar -zxf android-sdk_r24.3.3-linux.tgz && - $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-22.0.1,android-10 --no-ui --force --no-https; - fi +- brew update +- brew install qt5 - sudo pip install pyjavaproperties - sudo pip install github3.py -- sudo pip install cpp-coveralls +- brew install dpkg +- curl -s -f -L https://raw.github.com/r-plus/dotfiles/master/install_theos.sh | bash +- pwd +- ls env: global: - - secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8=" - - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ=" - - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA=" + secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8=" -script: "tools/travis-script.sh" +script: +- /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics +- make -j 4 dmg +- cd projects/mtg/iOS +- make -j 4 after_success: -- coveralls -b . -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' -- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH -- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH -- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH +- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH diff --git a/projects/mtg/iOS/Makefile b/projects/mtg/iOS/Makefile new file mode 100644 index 000000000..92bb03473 --- /dev/null +++ b/projects/mtg/iOS/Makefile @@ -0,0 +1,201 @@ +export ARCHS = armv7 armv7s +export TARGET = iphone:clang:latest:8.0 + +include theos/makefiles/common.mk + +APPLICATION_NAME = wagic +wagic_FILES = ../../../JGE/src/iOS/main.m\ + ../../../JGE/src/iOS/wagicAppDelegate.m\ + ../../../JGE/src/iOS/ES2Renderer.m\ + ../../../JGE/src/iOS/EAGLView.m\ + ../../../JGE/src/iOS/EAGLViewController.m\ + ../../../JGE/src/iOS/JSfx.cpp\ + ../../../JGE/src/pc/JGfx.cpp\ + ../iOS/UI/WagicDownloadProgressViewController.m\ + ../iOS/asi-http-request/ASIAuthenticationDialog.m\ + ../iOS/asi-http-request/ASIDataCompressor.m\ + ../iOS/asi-http-request/ASIDataDecompressor.m\ + ../iOS/asi-http-request/ASIDownloadCache.m\ + ../iOS/asi-http-request/ASIFormDataRequest.m\ + ../iOS/asi-http-request/ASIHTTPRequest.m\ + ../iOS/asi-http-request/ASIInputStream.m\ + ../iOS/asi-http-request/ASINetworkQueue.m\ + ../iOS/SoundManager/SoundManager.m\ + ../iOS/SoundManager/MyOpenALSupport.c\ + ../iOS/Reachability/Reachability/Reachability.m\ + ../../../JGE/src/unzip/unzip.c\ + ../../../JGE/src/unzip/zip.c\ + ../../../JGE/src/unzip/ioapi.c\ + ../ZipArchive.mm\ + ../src/SimpleMenu.cpp\ + ../src/AbilityParser.cpp\ + ../src/ActionElement.cpp\ + ../src/ActionLayer.cpp\ + ../src/ActionStack.cpp\ + ../src/AIHints.cpp\ + ../src/AIMomirPlayer.cpp\ + ../src/AIPlayer.cpp\ + ../src/AIPlayerBaka.cpp\ + ../src/AIStats.cpp\ + ../src/AllAbilities.cpp\ + ../src/CardDescriptor.cpp\ + ../src/CardDisplay.cpp\ + ../src/CardGui.cpp\ + ../src/CardPrimitive.cpp\ + ../src/CardSelector.cpp\ + ../src/CarouselDeckView.cpp\ + ../src/Closest.cpp\ + ../src/Counters.cpp\ + ../src/Credits.cpp\ + ../src/Damage.cpp\ + ../src/DamagerDamaged.cpp\ + ../src/DeckDataWrapper.cpp\ + ../src/DeckEditorMenu.cpp\ + ../src/DeckManager.cpp\ + ../src/DeckMenu.cpp\ + ../src/DeckMenuItem.cpp\ + ../src/DeckMetaData.cpp\ + ../src/DeckStats.cpp\ + ../src/DeckView.cpp\ + ../src/DuelLayers.cpp\ + ../src/ExtraCost.cpp\ + ../src/GameApp.cpp\ + ../src/GameLauncher.cpp\ + ../src/GameObserver.cpp\ + ../src/GameOptions.cpp\ + ../src/GameStateAwards.cpp\ + ../src/GameState.cpp\ + ../src/GameStateDeckViewer.cpp\ + ../src/GameStateDuel.cpp\ + ../src/GameStateMenu.cpp\ + ../src/GameStateOptions.cpp\ + ../src/GameStateShop.cpp\ + ../src/GameStateStory.cpp\ + ../src/GameStateTransitions.cpp\ + ../src/GridDeckView.cpp\ + ../src/GuiAvatars.cpp\ + ../src/GuiBackground.cpp\ + ../src/GuiCardsController.cpp\ + ../src/GuiCombat.cpp\ + ../src/GuiFrame.cpp\ + ../src/GuiHand.cpp\ + ../src/GuiLayers.cpp\ + ../src/GuiMana.cpp\ + ../src/GuiPhaseBar.cpp\ + ../src/GuiPlay.cpp\ + ../src/GuiStatic.cpp\ + ../src/IconButton.cpp\ + ../src/InteractiveButton.cpp\ + ../src/ManaCost.cpp\ + ../src/ManaCostHybrid.cpp\ + ../src/MenuItem.cpp\ + ../src/ModRules.cpp\ + ../src/MTGAbility.cpp\ + ../src/MTGCard.cpp\ + ../src/MTGCardInstance.cpp\ + ../src/MTGDeck.cpp\ + ../src/MTGDefinitions.cpp\ + ../src/MTGGamePhase.cpp\ + ../src/MTGGameZones.cpp\ + ../src/MTGPack.cpp\ + ../src/MTGRules.cpp\ + ../src/ObjectAnalytics.cpp\ + ../src/OptionItem.cpp\ + ../src/PhaseRing.cpp\ + ../src/Player.cpp\ + ../src/PlayerData.cpp\ + ../src/PlayGuiObject.cpp\ + ../src/PlayGuiObjectController.cpp\ + ../src/PlayRestrictions.cpp\ + ../src/Pos.cpp\ + ../src/PriceList.cpp\ + ../src/ReplacementEffects.cpp\ + ../src/Rules.cpp\ + ../src/SimpleButton.cpp\ + ../src/SimpleMenu.cpp\ + ../src/SimpleMenuItem.cpp\ + ../src/SimplePad.cpp\ + ../src/SimplePopup.cpp\ + ../src/StoryFlow.cpp\ + ../src/Subtypes.cpp\ + ../src/StyleManager.cpp\ + ../src/TargetChooser.cpp\ + ../src/TargetsList.cpp\ + ../src/Tasks.cpp\ + ../src/TextScroller.cpp\ + ../src/ThisDescriptor.cpp\ + ../src/Token.cpp\ + ../src/Translate.cpp\ + ../src/TranslateKeys.cpp\ + ../src/Trash.cpp\ + ../src/utils.cpp\ + ../src/WCachedResource.cpp\ + ../src/WDataSrc.cpp\ + ../src/WEvent.cpp\ + ../src/WFilter.cpp\ + ../src/WFont.cpp\ + ../src/WGui.cpp\ + ../src/WResourceManager.cpp \ + ../src/AIPlayerBakaB.cpp \ + ../src/TestSuiteAI.cpp\ + ../../../JGE/src/Encoding.cpp\ + ../../../JGE/src/JAnimator.cpp\ + ../../../JGE/src/JApp.cpp\ + ../../../JGE/src/JDistortionMesh.cpp\ + ../../../JGE/src/JFileSystem.cpp\ + ../../../JGE/src/JGameObject.cpp\ + ../../../JGE/src/JGE.cpp\ + ../../../JGE/src/JGui.cpp\ + ../../../JGE/src/JLogger.cpp\ + ../../../JGE/src/JLBFont.cpp\ + ../../../JGE/src/JOBJModel.cpp\ + ../../../JGE/src/JParticle.cpp\ + ../../../JGE/src/JParticleEffect.cpp\ + ../../../JGE/src/JParticleEmitter.cpp\ + ../../../JGE/src/JParticleSystem.cpp\ + ../../../JGE/src/JResourceManager.cpp\ + ../../../JGE/src/JSpline.cpp\ + ../../../JGE/src/JSprite.cpp\ + ../../../JGE/src/Vector2D.cpp\ + ../../../JGE/src/tinyxml/tinystr.cpp\ + ../../../JGE/src/tinyxml/tinyxml.cpp\ + ../../../JGE/src/tinyxml/tinyxmlerror.cpp\ + ../../../JGE/src/tinyxml/tinyxmlparser.cpp\ + ../../../JGE/src/hge/hgecolor.cpp\ + ../../../JGE/src/hge/hgedistort.cpp\ + ../../../JGE/src/hge/hgefont.cpp\ + ../../../JGE/src/hge/hgeparticle.cpp\ + ../../../JGE/src/hge/hgerect.cpp\ + ../../../JGE/src/hge/hgevector.cpp\ + ../../../JGE/src/zipFS/zfsystem.cpp\ + ../../../JGE/src/zipFS/ziphdr.cpp\ + ../../../JGE/src/zipFS/zstream.cpp\ + ../../../Boost/lib/pthread/once.cpp\ + ../../../Boost/lib/pthread/thread.cpp\ + + +wagic_LDFLAGS = -lz +wagic_FRAMEWORKS = UIKit CoreGraphics OpenGLES Foundation CFNetwork MobileCoreServices AVFoundation OpenAL AudioToolbox QuartzCore SystemConfiguration +include $(THEOS_MAKE_PATH)/application.mk + +ADDITIONAL_CFLAGS = -I ../include\ + -I ../../../JGE/include\ + -I ../../../JGE/src/unzip\ + -I ../../../JGE/src/zipFS\ + -I ../../../JGE/Dependencies/include\ + -I ../../../Boost\ + -I ../../../JGE/src/iOS\ + -I ../iOS/UI\ + -I ../iOS/Reachability/Reachability\ 2.0.4ddg/Reachability\ + -I ../iOS/asi-http-request\ + -I ../iOS/ZipArchive\ + -I ../iOS/SoundManager\ + -DIOS -D__arm__ -DTIXML_USE_STL -DVERSION=\"$(GIT_VERSION)\"\ + -Wno-parentheses-equality -Wno-delete-non-virtual-dtor\ + -Wno-tautological-undefined-compare -Wno-undefined-bool-conversion\ + -Wno-visibility -Wno-deprecated-declarations -Wno-non-literal-null-conversion\ + -Wno-format -Wno-distributed-object-modifiers -Wno-missing-braces\ + -Wno-unused-const-variable -Wno-unused-function\ + -x objective-c++ + +_THEOS_TARGET_ONLY_OBJCFLAGS :=""