Switch back to java oracle 8 to build android app

Some fixes

.gitignore

@@ -0,0 +1,243 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlog
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist/
+build/
+eggs/
+parts/
+var/
+sdist/
+develop-eggs/
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+
+#for XCode and MacOS
+## Mac OS X
+*.DS_Store
+
+# Xcode
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+*.xcuserstate
+project.xcworkspace/
+xcuserdata/
+
+# Generated files
+*.o
+*.pyc
+
+
+#Python modules
+MANIFEST
+dist/
+build/
+
+# Backup files
+*~.nib

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "thirdparty/zlib"]
+	path = thirdparty/zlib
+	url = https://github.com/madler/zlib
+[submodule "thirdparty/SDL2"]
+	path = thirdparty/SDL2
+	url = https://github.com/spurious/SDL-mirror.git

.travis.yml

@@ -0,0 +1,153 @@
+language: cpp
+branches:
+  except:
+    - latest-master
+    - latest-cmake
+
+matrix:
+  include:
+    - os: linux
+      env: BUILD_TYPE=PSP
+      sudo: required
+    - os: linux
+      env: BUILD_TYPE=SDL
+      sudo: required
+    - os: linux
+      env: BUILD_TYPE=Qt
+      sudo: required
+    - os: osx
+      env: BUILD_TYPE=Qt
+    - os: osx
+      env: BUILD_TYPE=iOS
+    - os: linux
+      language: android
+      env: BUILD_TYPE=ANDROID
+      sudo: required
+    - os: osx
+      env: BUILD_TYPE=Emscripten
+
+android:
+  components:
+    - platform-tools
+    - build-tools-23.0.1
+    - android-10
+
+cache:
+  directories:
+    - opt/pspsdk
+    - android-ndk-r9   
+
+before_install:
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty universe" &&
+      sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty main" &&
+      sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test &&
+      sudo apt-get -qq update &&
+      sudo apt-get -qq install g++-4.8 &&
+      sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90;
+    fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      brew update &&
+      brew install dpkg &&
+      pwd &&
+      ls;
+    fi    
+  - if [ "$BUILD_TYPE" == "iOS" ]; then
+      curl -s -f -L https://raw.github.com/r-plus/dotfiles/master/install_theos.sh | bash &&
+      pwd &&
+      ls;
+    fi    
+# Building for PSP here
+  - if [ "$BUILD_TYPE" == "PSP" ]; then
+      export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" &&
+      export PSPSDK="$PSPDEV/psp/sdk" &&
+      export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" &&
+      wget -O sdk.lzma https://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_TYPE" == "ANDROID" ]; then
+      export ANDROID="/usr/local/android-sdk-linux/tools/android" &&
+      export PATH=$PATH:"/usr/local/android-sdk-linux/tools" &&
+      wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv &&
+      wget https://bitbucket.org/ewing/sdl_androidcmake/get/4e9e88c03f04.zip -nv;
+    fi
+# Building for Qt here
+  - if [ "$BUILD_TYPE" == "Qt" ] && [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      brew install qt5 &&
+      export QMAKE="qmake -qt=qt5";
+    fi
+  - if [ "$BUILD_TYPE" == "Qt" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev &&
+      export QMAKE="qmake -qt=qt5";
+    fi
+# Building for SDL here
+  - if [ "$BUILD_TYPE" == "SDL" ]; then
+      export SDL2DIR="$TRAVIS_BUILD_DIR/thirdparty/SDL2";
+    fi
+# Building for Emscripten here
+  - if [ "$BUILD_TYPE" == "Emscripten" ] && [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      brew install emscripten && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc;
+    fi
+
+install:
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      if [[ -z "$(ls -A ${DEPS_DIR}/cmake/bin)" ]]; then
+        CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
+        mkdir -p cmake && travis_retry wget --no-check-certificate --quiet -O - "${CMAKE_URL}" | tar --strip-components=1 -xz -C cmake
+      fi
+      export PATH="${DEPS_DIR}/cmake/bin:${PATH}"
+    fi
+  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi
+    fi
+  - if [ "$BUILD_TYPE" == "PSP" ]; then
+      tar -x --xz -f sdk.lzma;
+    fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" == "ANDROID" ]; then
+      jdk_switcher use openjdk7 %%
+      tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 &&
+      export ANDROID_NDK=`pwd`/android-ndk-r9 &&
+      unzip 4e9e88c03f04.zip &&
+      rm -rf thirdparty/SDL2/* &&
+      mv ewing-sdl_androidcmake-4e9e88c03f04/* thirdparty/SDL2/ &&
+      sudo pip install cpp-coveralls &&
+      sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev ant;
+    fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" != "ANDROID" ]; then
+      jdk_switcher use openjdk7 &&
+      sudo pip install cpp-coveralls &&
+      sudo apt-get install --force-yes -qq libtinyxml-dev libjpeg-dev libpng-dev libgif-dev libz-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev ant;
+    fi
+  - sudo pip install pyjavaproperties
+  - sudo pip install github3.py
+
+env:
+  global:
+#  - JAVA_HOME=/usr/lib/jvm/java-7-oracle # Force set JVM version to comply with Travis Ant version (1.8.2)
+  - 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="
+
+script: "tools/travis-script.sh"
+
+after_success:
+- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" == "Qt" ]; then
+    coveralls -b . -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp';
+  fi
+- if [ "$BUILD_TYPE" == "ANDROID" ]; then
+    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 build_android/package/bin/Wagic_*.apk -r Wagic-android.apk -b $TRAVIS_BRANCH;
+  fi
+- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_TYPE" == "PSP" ]; then
+    python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l build_psp/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH;
+  fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$BUILD_TYPE" == "iOS" ]; then
+    python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l net.wagic_0.19.2-1_iphoneos-arm.deb -r Wagic-iOS.deb -b $TRAVIS_BRANCH;
+  fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$BUILD_TYPE" == "Qt" ]; then
+    python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l build_qt_widget/wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH;
+  fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$BUILD_TYPE" == "Emscripten" ]; then
+    ./tools/deploy-emscripten.sh;
+  fi

CHANGELOG.md

@@ -0,0 +1,221 @@
+# Changelog
+
+## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master)
+#### 8/3/16
+- *Merged pull-request:* andAbility on ATokenCreator, Extend AAFlip [#\824] (https://github.com/WagicProject/wagic/pull/824) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/31/16
+- *Merged pull-request:* Fix Chandra, Flamecaller & Cryptolith Rite [#\818] (https://github.com/WagicProject/wagic/pull/818) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/28/16
+- *Merged pull-request:* changing some of the logic to the previous fixes, we want to avoid using code that looks for specific card names. [#\800] (https://github.com/WagicProject/wagic/pull/800) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 7/26/16
+- *Merged pull-request:* granted flashback [#\791] (https://github.com/WagicProject/wagic/pull/791) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/23/16
+- *Merged pull-request:* Fix Flying vs Moat (multiples of them). Fixes issue #526 [#\783] (https://github.com/WagicProject/wagic/pull/783) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/19/16
+- *Merged pull-request:* pushing to master [#\770] (https://github.com/WagicProject/wagic/pull/770) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 7/18/16
+- *Merged pull-request:* Fix Deck Menu layer, Change Main Menu Layout, Fix Crash cdaactive on tokens [#\765] (https://github.com/WagicProject/wagic/pull/765) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/12/16
+- *Merged pull-request:* Pushing fixes [#\750] (https://github.com/WagicProject/wagic/pull/750) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* try to fix failed logic here [#\747] (https://github.com/WagicProject/wagic/pull/747) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/9/16
+- *Merged pull-request:* pushing to master [#\738] (https://github.com/WagicProject/wagic/pull/738) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\736] (https://github.com/WagicProject/wagic/pull/736) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/7/16
+- *Merged pull-request:* Sorted Primitives and Cleanup Tabs [#\727] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* push to wagicproject [#\725] (https://github.com/WagicProject/wagic/pull/725) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 7/4/16
+- *Merged pull-request:* Sorted Primitives & Updated Premium Deck Series [#\719] (https://github.com/WagicProject/wagic/pull/719) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Fails but I have no idea why [#\717] (https://github.com/WagicProject/wagic/pull/717) ([zethfoxster](https://github.com/zethfoxster))
+
+- *Merged pull-request:* Updated Sets [#\715] (https://github.com/WagicProject/wagic/pull/715) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/2/16
+- *Merged pull-request:* Updated Masters, Beginners, Duels and Vault Sets [#\714] (https://github.com/WagicProject/wagic/pull/714) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 7/1/16
+- *Merged pull-request:* Cleaned and Sorted all Core and Expansion Sets [#\713] (https://github.com/WagicProject/wagic/pull/713) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Soulbond Pair Indicator [#\712] (https://github.com/WagicProject/wagic/pull/712) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/30/16
+- *Merged pull-request:* Sorted Primitives [#\711] (https://github.com/WagicProject/wagic/pull/711) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Add Shackle Ability [#\710] (https://github.com/WagicProject/wagic/pull/710) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Fix Cascade, Crash fix on lastController and some corrections [#\709] (https://github.com/WagicProject/wagic/pull/709) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/29/16
+- *Merged pull-request:* Updated Primitives and Hide Highlight Border [#\707] (https://github.com/WagicProject/wagic/pull/707) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Committed:* Pretty huge patch here(sorry old habits never die :( )  [#\6ee00c1] (https://github.com/WagicProject/wagic/commit/6ee00c138ce374d54cb3ee034575ce440288ca0e) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 6/23/16
+- *Merged pull-request:* Fix producecolor:color [#\704] (https://github.com/WagicProject/wagic/pull/704) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/17/16
+- *Merged pull-request:* Force Mounting 2 [#\699] (https://github.com/WagicProject/wagic/pull/699) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/16/16
+- *Merged pull-request:* Import Deck Options [#\697] (https://github.com/WagicProject/wagic/pull/697) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/11/16
+- *Merged pull-request:* Refactor & Devotion [#\690] (https://github.com/WagicProject/wagic/pull/690) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 6/9/16
+- *Closed issue:* Clone goes to graveyard before being able to copy anything [\#546](https://github.com/WagicProject/wagic/issues/546)
+
+- *Closed issue:* Blinking an aura causes freeze [\#541](https://github.com/WagicProject/wagic/issues/541)
+
+- *Closed issue:* Profile name at upper left side is not being updated correctly [\#469](https://github.com/WagicProject/wagic/issues/469)
+
+- *Closed issue:* Giving card C protection from X does not remove cards attached to C which have quality X [\#464](https://github.com/WagicProject/wagic/issues/464)
+
+- *Closed issue:* (graphical glitch) wood / gold textures [\#461](https://github.com/WagicProject/wagic/issues/461)
+
+- *Closed issue:* Clone does not get all P/T bonuses [\#448](https://github.com/WagicProject/wagic/issues/448)
+
+- *Closed issue:* Card "threaten" messes up the GUI [\#473](https://github.com/WagicProject/wagic/issues/473)
+
+#### 6/7/16
+- *Closed issue:* Emrakul isn't killed by creatures with deathtouch [\#597](https://github.com/WagicProject/wagic/issues/597)
+
+#### 6/3/16
+- *Merged pull-request:* Cost Increaser & Reducer Fix [#\676] (https://github.com/WagicProject/wagic/pull/676) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 5/30/16
+- *Fixed Bug:* deckstats crash when "unlock cards" is used [#\668] (https://github.com/WagicProject/wagic/issues/668) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 5/26/16
+- *Closed issue:* Nasty memleak crashing devices and its fix. [#\664] (https://github.com/WagicProject/wagic/issues/664) ([zethfoxster](https://github.com/zethfoxster))
+
+#### 11/08/15
+- *Merged pull-request:* produce mana for lands you/opponent could produce [#\658] (https://github.com/WagicProject/wagic/pull/658) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 11/07/15
+- *Merged pull-request:* Manacost Changes, Anyzone for CDA, PayZero Cost [#\656] (https://github.com/WagicProject/wagic/pull/656) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/31/15
+- *Merged pull-request:* Exile Zone, Altercost and Hand modifier [#\653] (https://github.com/WagicProject/wagic/pull/653) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/17/15
+- *Merged pull-request:* Fix issue #473 #784 [#\646] (https://github.com/WagicProject/wagic/pull/646) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/15/15
+- *Merged pull-request:* Bug Fix: Planeswalker Rule & ABlink return to play ability for Aura cards [#\644] (https://github.com/WagicProject/wagic/pull/644) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/14/15
+- *Merged pull-request:* Fix Legend Rule [#\643] (https://github.com/WagicProject/wagic/pull/643) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/12/15
+- *Merged pull-request:* Fix crash bug, support doubled res texture for background, avatars, menutitle [#\641] (https://github.com/WagicProject/wagic/pull/641) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 10/02/15
+- *Merged pull-request:* LKI for power, toughness and basic abilities, produceextra ability [#\636] (https://github.com/WagicProject/wagic/pull/636) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/29/15
+- *Merged pull-request:* Fix Recover Cards, Cloner, Copier, and Preliminary support for Madness [#\635] (https://github.com/WagicProject/wagic/pull/635) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/22/15
+- *Merged pull-request:* Auraward, unattach event and statebased action for protection from quality [#\631] (https://github.com/WagicProject/wagic/pull/631) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/19/15
+- *Merged pull-request:* PT Switch like Layer 7e and Token Indicator [#\626] (https://github.com/WagicProject/wagic/pull/626) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/18/15
+- *Merged pull-request:* Token Cloning fix and colored PT [#\624] (https://github.com/WagicProject/wagic/pull/624) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 09/15/15
+- *Merged pull-request:* CDA and X manacost on stack [\#623] (https://github.com/WagicProject/wagic/pull/623) ([kevlahnota](https://github.com/kevlahnota))
+
+#### 08/12/14
+- *Merged pull-request:* Fix for guild_keywords Devotion, added some "Chroma" cards [\#606](https://github.com/WagicProject/wagic/pull/606) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* added guild keywords, added specific life cost [\#605](https://github.com/WagicProject/wagic/pull/605) ([kevlahnota](https://github.com/kevlahnota))
+
+- *Merged pull-request:* Buyback issue and a fix [\#604](https://github.com/WagicProject/wagic/pull/604) ([apollovy](https://github.com/apollovy))
+
+- *Merged pull-request:* Feature/ios update xcode5.1 [\#602](https://github.com/WagicProject/wagic/pull/602) ([mjnguyen](https://github.com/mjnguyen))
+
+- *Merged pull-request:* Remove dead code and fix circular initialization [\#601](https://github.com/WagicProject/wagic/pull/601) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* update android build tools version [\#600](https://github.com/WagicProject/wagic/pull/600) ([Rolzad73](https://github.com/Rolzad73))
+
+- *Merged pull-request:* Attempt to make android tools fetching for TravisCI explicit and futureproof [\#599](https://github.com/WagicProject/wagic/pull/599) ([Rolzad73](https://github.com/Rolzad73))
+
+- *Merged pull-request:* Damager keyword [\#598](https://github.com/WagicProject/wagic/pull/598) ([bjornsnoen](https://github.com/bjornsnoen))
+
+- *Merged pull-request:* Fix a rarity mistake and a grammatical error [\#596](https://github.com/WagicProject/wagic/pull/596) ([bjornsnoen](https://github.com/bjornsnoen))
+
+- *Merged pull-request:* Fix bug where the phase wheel got out of sync [\#588](https://github.com/WagicProject/wagic/pull/588) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* More easing [\#586](https://github.com/WagicProject/wagic/pull/586) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Added Avatar Tokens created by Ajani Goldmane. [\#585](https://github.com/WagicProject/wagic/pull/585) ([bjornsnoen](https://github.com/bjornsnoen))
+
+- *Merged pull-request:* Cleanup, usability fixes and source code documentation for DeckView.h and GridDeckView.h [\#583](https://github.com/WagicProject/wagic/pull/583) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Fixed bug:* Blight does not destroy at the end of turn but right now [\#592](https://github.com/WagicProject/wagic/issues/592)
+
+- *Fixed bug:* game freezes on Android when the phone returns from "sleep mode" [\#544](https://github.com/WagicProject/wagic/issues/544)
+
+- *Fixed bug:* Android port needs to be able to respond to attaching/detaching devices to it [\#522](https://github.com/WagicProject/wagic/issues/522)
+
+## [alpha-195] (https://github.com/WagicProject/wagic/tree/alpha-195)
+#### 07/12/13
+- *Merged pull-request:* Reset positions and filters when reopening the editor [\#578](https://github.com/WagicProject/wagic/pull/578) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Deck viewer [\#577](https://github.com/WagicProject/wagic/pull/577) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Do not specify the system directory in JGE [\#576](https://github.com/WagicProject/wagic/pull/576) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Changed Travis build file to use Android API 10 and Android build tools 18.1.1 [\#575](https://github.com/WagicProject/wagic/pull/575) ([Rolzad73](https://github.com/Rolzad73))
+
+- *Merged pull-request:* Feature/play from grave [\#574](https://github.com/WagicProject/wagic/pull/574) ([pankdm](https://github.com/pankdm))
+
+- *Merged pull-request:* Fix Valgrind warnings appearing during the test suit. [\#573](https://github.com/WagicProject/wagic/pull/573) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Strings 2 [\#572](https://github.com/WagicProject/wagic/pull/572) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Android travis ci [\#570](https://github.com/WagicProject/wagic/pull/570) ([xawotihs](https://github.com/xawotihs))
+
+- *Merged pull-request:* Android NDK build fix [\#569](https://github.com/WagicProject/wagic/pull/569) ([Rolzad73](https://github.com/Rolzad73))
+
+- *Merged pull-request:* Add a few namespaces and fix header guards. [\#564](https://github.com/WagicProject/wagic/pull/564) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Updated deckmenu.cpp to properly render deck description and summary [\#562](https://github.com/WagicProject/wagic/pull/562) ([citiral](https://github.com/citiral))
+
+- *Merged pull-request:* Fix some valgrind memcheck warnings. However there remains one... [\#561](https://github.com/WagicProject/wagic/pull/561) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Remove some dead code [\#560](https://github.com/WagicProject/wagic/pull/560) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Show output only for failing tests [\#559](https://github.com/WagicProject/wagic/pull/559) ([pankdm](https://github.com/pankdm))
+
+- *Merged pull-request:* Defines/Typos [\#557](https://github.com/WagicProject/wagic/pull/557) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Simplify Damage::resolve a bit [\#556](https://github.com/WagicProject/wagic/pull/556) ([ZobyTwo](https://github.com/ZobyTwo))
+
+- *Merged pull-request:* Fix cranial plating [\#555](https://github.com/WagicProject/wagic/pull/555) ([pankdm](https://github.com/pankdm))
+
+- *Merged pull-request:* Android cleanup [\#1](https://github.com/WagicProject/wagic/pull/1) ([Rolzad73](https://github.com/Rolzad73))
+
+- *Fixed bug:* Iona and Nin don't work [\#527](https://github.com/WagicProject/wagic/issues/527)
+
+- *Closed issue:* Less verbose output of tests at Travis [\#558](https://github.com/WagicProject/wagic/issues/558)
+
+## [wagic-0.19.2] (https://github.com/WagicProject/wagic/tree/wagic-v0.19.2)
+#### 28/10/13

CMakeLists.txt

@@ -0,0 +1,239 @@
+cmake_minimum_required(VERSION 2.8.7)
+if(CMAKE_MAJOR_VERSION STRGREATER 3)
+	cmake_policy(SET CMP0054 NEW)
+endif()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeModules)
+
+#this block will fix install prefixes to install everything in a subdirectory
+#of cmake_binary_dir if we are on windows/android to make packaging more easy
+if(NOT CMAKE_TOOLCHAIN_FILE)
+  if(WIN32)
+    set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Install directory")
+  else()
+    set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install directory")
+  endif()
+else() #we are cross-compiling (psp/android)
+  #Android: set output folder for platform/android to pick up
+  set(LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "library output root")
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Install directory")
+endif()
+
+#set available build types (debug/release)
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
+if(DEFINED CMAKE_BUILD_TYPE)
+  set_property( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
+endif()
+
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Application output directory")
+
+
+project(wagic CXX C)
+#todo: somehow determine wagics version
+set(WAGIC_VERSION "0.19")
+
+#add standard paths to search for libraries. borrowed from opencv
+if(UNIX AND NOT ANDROID)
+  if(X86_64 OR CMAKE_SIZEOF_VOID_P EQUAL 8)
+    if(EXISTS /lib64)
+      list(APPEND CMAKE_LIBRARY_PATH /lib64)
+    else()
+      list(APPEND CMAKE_LIBRARY_PATH /lib)
+    endif()
+    if(EXISTS /usr/lib64)
+      list(APPEND CMAKE_LIBRARY_PATH /usr/lib64)
+    else()
+      list(APPEND CMAKE_LIBRARY_PATH /usr/lib)
+    endif()
+  elseif(X86 OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+    if(EXISTS /lib32)
+      list(APPEND CMAKE_LIBRARY_PATH /lib32)
+    else()
+      list(APPEND CMAKE_LIBRARY_PATH /lib)
+    endif()
+    if(EXISTS /usr/lib32)
+      list(APPEND CMAKE_LIBRARY_PATH /usr/lib32)
+    else()
+      list(APPEND CMAKE_LIBRARY_PATH /usr/lib)
+    endif()
+  endif()
+endif()
+
+if(ANDROID OR PSP OR IOS)
+    #to allow finding of pathes/headers/libs within the source tree
+    #even if only search for target platform libs
+    set(CMAKE_FIND_ROOT_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_FIND_ROOT_PATH})
+endif()
+
+#also borrowed from opencv
+if(MINGW)
+  if(EXISTS /mingw)
+      list(APPEND CMAKE_INCLUDE_PATH /mingw)
+  endif()
+  if(EXISTS /mingw32)
+      list(APPEND CMAKE_INCLUDE_PATH /mingw32)
+  endif()
+  if(EXISTS /mingw64)
+      list(APPEND CMAKE_INCLUDE_PATH /mingw64)
+  endif()
+endif()
+
+include(utils)
+
+#select the target backend
+if(PSP)
+    WAGIC_OPTION(backend_psp         "build for psp"          ON)
+endif()
+if(WIN32 OR ANDROID OR UNIX)
+    WAGIC_OPTION(backend_sdl         "build for sdl"          (WIN32 OR ANDROID OR EMSCRIPTEN))
+endif()
+if(NOT backend_sdl AND UNIX AND NOT ANDROID AND NOT IOS)
+    WAGIC_OPTION(backend_qt_console  "build qt-console version with testsuit" ON)
+    WAGIC_OPTION(backend_qt_widget   "build qt-widget version"                OFF)
+endif()
+
+#third party build options
+WAGIC_OPTION(BUILD_ZLIB    "build zlib from source"    WIN32 OR APPLE)
+WAGIC_OPTION(BUILD_JPEG    "build jpeg from source"    (WIN32 OR APPLE OR PSP OR ANDROID OR EMSCRIPTEN))
+WAGIC_OPTION(BUILD_PNG     "build png from source"     (WIN32 OR APPLE OR PSP OR ANDROID OR EMSCRIPTEN))
+WAGIC_OPTION(BUILD_UNZIP   "build unzip from source"   ON)
+WAGIC_OPTION(BUILD_TINYXML "build tinyxml from source" (WIN32 OR APPLE OR PSP OR ANDROID OR EMSCRIPTEN OR IOS))
+WAGIC_OPTION(BUILD_ZIPFS   "build zipfs from source"   ON)
+WAGIC_OPTION(BUILD_SDL2    "build SDL2 from source"    (backend_sdl AND (UNIX OR WIN32 OR ANDROID) AND (NOT EMSCRIPTEN AND NOT IOS)))
+
+#project options
+if(ANDROID)
+    WAGIC_OPTION(BUILD_ANDROID_PACKAGE "put the compiled code in an android package" ON)
+endif()
+
+
+if(ANDROID)
+    set(LIBRARY_OUTPUT_PATH        "${CMAKE_BINARY_DIR}/lib/${ANDROID_NDK_ABI_NAME}")
+    set(3P_LIBRARY_OUTPUT_PATH     "${CMAKE_BINARY_DIR}/3rdparty/lib/${ANDROID_NDK_ABI_NAME}")
+    set(WAGIC_LIB_INSTALL_PATH     sdk/native/libs/${ANDROID_NDK_ABI_NAME})
+    set(WAGIC_3P_LIB_INSTALL_PATH  sdk/native/3rdparty/libs/${ANDROID_NDK_ABI_NAME})
+    set(WAGIC_CONFIG_INSTALL_PATH  sdk/native/jni)
+    set(WAGIC_INCLUDE_INSTALL_PATH sdk/native/jni/include)
+    set(EXECUTABLE_OUTPUT_PATH     "${CMAKE_BINARY_DIR}/package/bin")
+else()
+    set(LIBRARY_OUTPUT_PATH        "${CMAKE_BINARY_DIR}/lib")
+    set(3P_LIBRARY_OUTPUT_PATH     "${CMAKE_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
+    set(WAGIC_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
+    set(WAGIC_3P_LIB_INSTALL_PATH  share/wagic/3rdparty/${WAGIC_LIB_INSTALL_PATH})
+    set(WAGIC_INCLUDE_INSTALL_PATH "include")
+    set(WAGIC_CONFIG_INSTALL_PATH  share/wagic)
+endif()
+
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${WAGIC_LIB_INSTALL_PATH}")
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+#if no build type is specified, we assume debug
+if(CMAKE_GENERATOR MATCHES "Makefiles|Ninja" AND "${CMAKE_BUILD_TYPE}" STREQUAL "")
+  set(CMAKE_BUILD_TYPE Debug)
+endif()
+
+include(FindOrBuild)
+
+#set platform dependend configurations
+if(PSP)
+    FindOrBuildPSPSDK()
+    include(platforms/psp/configure.cmake)
+elseif(EMSCRIPTEN)
+    include(platforms/emscripten/configure.cmake)
+elseif(WIN32)
+    include(platforms/win/configure.cmake)
+elseif(APPLE)
+    include(platforms/macosx/configure.cmake)
+elseif(UNIX AND NOT ANDROID)
+    include(platforms/unix/configure.cmake)
+elseif(ANDROID)
+    include(platforms/android/configure.cmake)
+endif()
+
+#set backend dependend configurations
+if(backend_qt_console OR backend_qt_widget)
+    add_definitions(-DQT_CONFIG)
+    if(backend_qt_console)
+        add_definitions(-DTESTSUITE -D_DEBUG)
+        add_definitions(-DCONSOLE_CONFIG -DCAPTURE_STDERR)
+    endif()
+elseif(backend_sdl)
+    add_definitions(-DSDL_CONFIG)
+endif()
+
+# find or build 3rd party libraries
+FindOrBuildZLIB()
+FindOrBuildOpenGL()
+FindOrBuildTinyXML()
+FindOrBuildZipFS()
+FindOrBuildUNZIP()
+FindOrBuildPNG()
+FindOrBuildJPEG()
+FindOrBuildBoost()
+if(PSP)
+    FindOrBuildGIF()
+endif()
+if(ANDROID)
+    FindOrBuildOpenSL()
+endif()
+if(backend_sdl)
+    FindOrBuildSDL2()
+endif()
+if(backend_psp)
+    FindOrBuildFreetype()
+    FindOrBuildHgeTools()
+    FindOrBuildMikMod()
+endif()
+if(backend_qt_console OR backend_qt_widget)
+    FindOrBuildQt()
+endif()
+if(ANDROID)
+    include(DetectAndroidSDK)
+endif()
+
+if(BUILD_ANDROID_PACKAGE)
+    find_package(Ant REQUIRED)
+endif()
+
+#add jge and mtg projects
+add_subdirectory(JGE)
+add_subdirectory(projects/mtg)
+
+if(BUILD_ANDROID_PACKAGE)
+  add_subdirectory(platforms/android/package)
+endif()
+
+if(EMSCRIPTEN)
+  set(CMAKE_EXECUTABLE_SUFFIX ".html")
+endif()
+
+if(IOS)
+  list_add_prefix(JGE_SOURCES " JGE/")
+  list_add_prefix(MTG_generic_src " projects/mtg/")
+  list_add_prefix(JGE_INCLUDE_DIRS " -IJGE/")
+  list_add_prefix(MTG_INCLUDE_DIRS " -Iprojects/mtg/")
+  list_add_prefix(TINYXML_SRC " thirdparty/tinyxml/")
+  list_add_prefix(UNZIP_SRC " thirdparty/unzip/")
+  list_add_prefix(ZIPFS_SRC " thirdparty/zipFS/")
+
+  file(WRITE makefile.ios
+     "ARCHS= armv7 armv7s \n"
+     "include ${THEOS_PATH}/makefiles/common.mk\n"
+     "TARGET= iphone:clang:latest:8.0 \n"
+     "APPLICATION_NAME = " ${PROJECT_NAME} "\n"
+     ${PROJECT_NAME} "_FILES =" ${ZIPFS_SRC} ${UNZIP_SRC} ${TINYXML_SRC} ${JGE_SOURCES} ${MTG_generic_src} " thirdparty/Boost/lib/pthread/once.cpp thirdparty/Boost/lib/pthread/thread.cpp\n"
+     ${PROJECT_NAME} "_LDFLAGS = -lz\n"
+     ${PROJECT_NAME} "_FRAMEWORKS = UIKit CoreGraphics OpenGLES Foundation CFNetwork MobileCoreServices AVFoundation OpenAL AudioToolbox QuartzCore SystemConfiguration\n"
+     "include ${THEOS_PATH}/makefiles/application.mk\n"
+     "ADDITIONAL_CFLAGS = " ${MTG_INCLUDE_DIRS} ${JGE_INCLUDE_DIRS} " -I" ${ZIPFS_INCLUDE_DIR} " -I" ${UNZIP_INCLUDE_DIR} " -I" ${HGE_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR} " -I" ${ZLIB_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} " "
+         "-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-uninitialized "
+         "-Wno-unused-const-variable -Wno-unused-function -Wno-unknown-warning-option -Wno-unused-local-typedef "
+         "-x objective-c++ \n"
+
+     "_THEOS_TARGET_ONLY_OBJCFLAGS :=\"\"\n"
+     )
+endif()

CMakeModules/DetectAndroidSDK.cmake

@@ -0,0 +1,373 @@
+if(EXISTS "${ANDROID_EXECUTABLE}")
+  set(ANDROID_SDK_DETECT_QUIET TRUE)
+endif()
+
+file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
+file(TO_CMAKE_PATH "$ENV{HOME}" HOME_ENV_PATH)
+
+if(CMAKE_HOST_WIN32)
+  set(ANDROID_SDK_OS windows)
+elseif(CMAKE_HOST_APPLE)
+  set(ANDROID_SDK_OS macosx)
+else()
+  set(ANDROID_SDK_OS linux)
+endif()
+
+#find android SDK: search in ANDROID_SDK first
+find_host_program(ANDROID_EXECUTABLE
+  NAMES android.bat android
+  PATH_SUFFIXES tools
+  PATHS
+    ENV ANDROID_SDK
+  DOC "Android SDK location"
+  NO_DEFAULT_PATH
+  )
+
+# Now search default paths
+find_host_program(ANDROID_EXECUTABLE
+  NAMES android.bat android
+  PATH_SUFFIXES android-sdk-${ANDROID_SDK_OS}/tools
+                android-sdk-${ANDROID_SDK_OS}_x86/tools
+                android-sdk-${ANDROID_SDK_OS}_86/tools
+                android-sdk/tools
+  PATHS /opt
+        "${HOME_ENV_PATH}/NVPACK"
+        "$ENV{SystemDrive}/NVPACK"
+        "${ProgramFiles_ENV_PATH}/Android"
+  DOC "Android SDK location"
+  )
+
+if(ANDROID_EXECUTABLE)
+  if(NOT ANDROID_SDK_DETECT_QUIET)
+    message(STATUS "Found android tool: ${ANDROID_EXECUTABLE}")
+  endif()
+
+  get_filename_component(ANDROID_SDK_TOOLS_PATH "${ANDROID_EXECUTABLE}" PATH)
+
+  #read source.properties
+  if(EXISTS "${ANDROID_SDK_TOOLS_PATH}/source.properties")
+    file(STRINGS "${ANDROID_SDK_TOOLS_PATH}/source.properties" ANDROID_SDK_TOOLS_SOURCE_PROPERTIES_LINES REGEX "^[ ]*[^#].*$")
+    foreach(line ${ANDROID_SDK_TOOLS_SOURCE_PROPERTIES_LINES})
+      string(REPLACE "\\:" ":" line ${line})
+      string(REPLACE "=" ";" line ${line})
+      list(GET line 0 line_name)
+      list(GET line 1 line_value)
+      string(REPLACE "." "_" line_name ${line_name})
+      SET(ANDROID_TOOLS_${line_name} "${line_value}" CACHE INTERNAL "from ${ANDROID_SDK_TOOLS_PATH}/source.properties")
+      MARK_AS_ADVANCED(ANDROID_TOOLS_${line_name})
+    endforeach()
+  endif()
+
+  #fix missing revision (SDK tools before r9 don't set revision number correctly)
+  if(NOT ANDROID_TOOLS_Pkg_Revision)
+    SET(ANDROID_TOOLS_Pkg_Revision "Unknown" CACHE INTERNAL "")
+    MARK_AS_ADVANCED(ANDROID_TOOLS_Pkg_Revision)
+  endif()
+
+  #fix missing description
+  if(NOT ANDROID_TOOLS_Pkg_Desc)
+    SET(ANDROID_TOOLS_Pkg_Desc "Android SDK Tools, revision ${ANDROID_TOOLS_Pkg_Revision}." CACHE INTERNAL "")
+    MARK_AS_ADVANCED(ANDROID_TOOLS_Pkg_Desc)
+  endif()
+
+  #warn about outdated SDK
+  if(NOT ANDROID_TOOLS_Pkg_Revision GREATER 13)
+    SET(ANDROID_TOOLS_Pkg_Desc "${ANDROID_TOOLS_Pkg_Desc} It is recommended to update your SDK tools to revision 14 or newer." CACHE INTERNAL "")
+  endif()
+
+  if(ANDROID_TOOLS_Pkg_Revision GREATER 13)
+    SET(ANDROID_PROJECT_PROPERTIES_FILE project.properties)
+    SET(ANDROID_ANT_PROPERTIES_FILE ant.properties)
+  else()
+    SET(ANDROID_PROJECT_PROPERTIES_FILE default.properties)
+    SET(ANDROID_ANT_PROPERTIES_FILE build.properties)
+  endif()
+
+  set(ANDROID_MANIFEST_FILE AndroidManifest.xml)
+  set(ANDROID_LIB_PROJECT_FILES build.xml local.properties proguard-project.txt ${ANDROID_PROJECT_PROPERTIES_FILE})
+  set(ANDROID_PROJECT_FILES ${ANDROID_LIB_PROJECT_FILES})
+
+  #get installed targets
+  if(ANDROID_TOOLS_Pkg_Revision GREATER 11)
+    execute_process(COMMAND ${ANDROID_EXECUTABLE} list target -c
+      RESULT_VARIABLE ANDROID_PROCESS
+      OUTPUT_VARIABLE ANDROID_SDK_TARGETS
+      ERROR_VARIABLE ANDROID_PROCESS_ERRORS
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+    string(REGEX MATCHALL "[^\n]+" ANDROID_SDK_TARGETS "${ANDROID_SDK_TARGETS}")
+  else()
+    #old SDKs (r11 and older) don't provide compact list
+    execute_process(COMMAND ${ANDROID_EXECUTABLE} list target
+      RESULT_VARIABLE ANDROID_PROCESS
+      OUTPUT_VARIABLE ANDROID_SDK_TARGETS_FULL
+      ERROR_VARIABLE ANDROID_PROCESS_ERRORS
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+    string(REGEX MATCHALL "(^|\n)id: [0-9]+ or \"([^\n]+[0-9+])\"(\n|$)" ANDROID_SDK_TARGETS_FULL "${ANDROID_SDK_TARGETS_FULL}")
+
+    SET(ANDROID_SDK_TARGETS "")
+    if(ANDROID_PROCESS EQUAL 0)
+      foreach(line ${ANDROID_SDK_TARGETS_FULL})
+        string(REGEX REPLACE "(^|\n)id: [0-9]+ or \"([^\n]+[0-9+])\"(\n|$)" "\\2" line "${line}")
+        list(APPEND ANDROID_SDK_TARGETS "${line}")
+      endforeach()
+    endif()
+  endif()
+
+  if(NOT ANDROID_PROCESS EQUAL 0)
+    message(ERROR "Failed to get list of installed Android targets.")
+    set(ANDROID_EXECUTABLE "ANDROID_EXECUTABLE-NOTFOUND")
+  endif()
+
+  # clear ANDROID_SDK_TARGET if no target is provided by user
+  if(NOT ANDROID_SDK_TARGET)
+    set(ANDROID_SDK_TARGET "" CACHE STRING "Android SDK target for the Wagic Java API and samples")
+  endif()
+  if(ANDROID_SDK_TARGETS)
+    set_property( CACHE ANDROID_SDK_TARGET PROPERTY STRINGS ${ANDROID_SDK_TARGETS} )
+  endif()
+endif(ANDROID_EXECUTABLE)
+
+# finds minimal installed SDK target compatible with provided names or API levels
+# usage:
+#   get_compatible_android_api_level(VARIABLE [level1] [level2] ...)
+macro(android_get_compatible_target VAR)
+  set(${VAR} "${VAR}-NOTFOUND")
+  if(ANDROID_SDK_TARGETS)
+    list(GET ANDROID_SDK_TARGETS 0 __lvl)
+    string(REGEX MATCH "[0-9]+$" __lvl "${__lvl}")
+
+    #find minimal level mathing to all provided levels
+    foreach(lvl ${ARGN})
+      string(REGEX MATCH "[0-9]+$" __level "${lvl}")
+      if(__level GREATER __lvl)
+        set(__lvl ${__level})
+      endif()
+    endforeach()
+
+    #search for compatible levels
+    foreach(lvl ${ANDROID_SDK_TARGETS})
+      string(REGEX MATCH "[0-9]+$" __level "${lvl}")
+      if(__level EQUAL __lvl)
+        #look for exact match
+        foreach(usrlvl ${ARGN})
+          if("${usrlvl}" STREQUAL "${lvl}")
+            set(${VAR} "${lvl}")
+            break()
+          endif()
+        endforeach()
+        if("${${VAR}}" STREQUAL "${lvl}")
+          break() #exact match was found
+        elseif(NOT ${VAR})
+          set(${VAR} "${lvl}")
+        endif()
+      elseif(__level GREATER __lvl)
+        if(NOT ${VAR})
+          set(${VAR} "${lvl}")
+        endif()
+        break()
+      endif()
+    endforeach()
+
+    unset(__lvl)
+    unset(__level)
+  endif()
+endmacro()
+
+unset(__android_project_chain CACHE)
+
+# add_android_project(target_name ${path} NATIVE_DEPS opencv_core LIBRARY_DEPS ${Wagic_BINARY_DIR} SDK_TARGET 11)
+macro(add_android_project target path)
+  # parse arguments
+  set(android_proj_arglist NATIVE_DEPS LIBRARY_DEPS SDK_TARGET IGNORE_JAVA IGNORE_MANIFEST)
+  set(__varname "android_proj_")
+  foreach(v ${android_proj_arglist})
+    set(${__varname}${v} "")
+  endforeach()
+  foreach(arg ${ARGN})
+    set(__var "${__varname}")
+    foreach(v ${android_proj_arglist})
+      if("${v}" STREQUAL "${arg}")
+        set(__varname "android_proj_${v}")
+        break()
+      endif()
+    endforeach()
+    if(__var STREQUAL __varname)
+      list(APPEND ${__var} "${arg}")
+    endif()
+  endforeach()
+
+  # get compatible SDK target
+  android_get_compatible_target(android_proj_sdk_target ${ANDROID_NATIVE_API_LEVEL} ${android_proj_SDK_TARGET})
+
+  if(NOT android_proj_sdk_target)
+    message(WARNING "Can not find any SDK target compatible with: ${ANDROID_NATIVE_API_LEVEL} ${android_proj_SDK_TARGET}
+                     The project ${target} will not be build")
+  endif()
+
+  # check native dependencies
+  if(android_proj_IGNORE_JAVA)
+    ocv_check_dependencies(${android_proj_NATIVE_DEPS})
+  else()
+    ocv_check_dependencies(${android_proj_NATIVE_DEPS} opencv_java)
+  endif()
+
+  if(EXISTS "${path}/jni/Android.mk" )
+    # find if native_app_glue is used
+    file(STRINGS "${path}/jni/Android.mk" NATIVE_APP_GLUE REGEX ".*(call import-module,android/native_app_glue)" )
+    if(NATIVE_APP_GLUE)
+      if(ANDROID_NATIVE_API_LEVEL LESS 9 OR NOT EXISTS "${ANDROID_NDK}/sources/android/native_app_glue")
+        set(OCV_DEPENDENCIES_FOUND FALSE)
+      endif()
+    endif()
+  endif()
+
+  if(OCV_DEPENDENCIES_FOUND AND android_proj_sdk_target AND ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND ANDROID_TOOLS_Pkg_Revision GREATER 13 AND EXISTS "${path}/${ANDROID_MANIFEST_FILE}")
+
+    project(${target})
+    set(android_proj_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build")
+
+    # get project sources
+    file(GLOB_RECURSE android_proj_files RELATIVE "${path}" "${path}/res/*" "${path}/src/*")
+
+    if(NOT android_proj_IGNORE_MANIFEST)
+      list(APPEND android_proj_files ${ANDROID_MANIFEST_FILE})
+    endif()
+
+    # copy sources out from the build tree
+    set(android_proj_file_deps "")
+    foreach(f ${android_proj_files})
+      add_custom_command(
+        OUTPUT "${android_proj_bin_dir}/${f}"
+        COMMAND ${CMAKE_COMMAND} -E copy "${path}/${f}" "${android_proj_bin_dir}/${f}"
+        MAIN_DEPENDENCY "${path}/${f}"
+        COMMENT "Copying ${f}")
+      list(APPEND android_proj_file_deps "${path}/${f}" "${android_proj_bin_dir}/${f}")
+    endforeach()
+
+    set(android_proj_lib_deps_commands "")
+    set(android_proj_target_files ${ANDROID_PROJECT_FILES})
+    ocv_list_add_prefix(android_proj_target_files "${android_proj_bin_dir}/")
+
+    # process Android library dependencies
+    foreach(dep ${android_proj_LIBRARY_DEPS})
+      file(RELATIVE_PATH __dep "${android_proj_bin_dir}" "${dep}")
+      list(APPEND android_proj_lib_deps_commands
+        COMMAND ${ANDROID_EXECUTABLE} --silent update project --path "${android_proj_bin_dir}" --library "${__dep}")
+    endforeach()
+
+    # fix Android project
+    add_custom_command(
+        OUTPUT ${android_proj_target_files}
+        COMMAND ${CMAKE_COMMAND} -E remove ${android_proj_target_files}
+        COMMAND ${ANDROID_EXECUTABLE} --silent update project --path "${android_proj_bin_dir}" --target "${android_proj_sdk_target}" --name "${target}"
+        ${android_proj_lib_deps_commands}
+        MAIN_DEPENDENCY "${android_proj_bin_dir}/${ANDROID_MANIFEST_FILE}"
+        DEPENDS "${path}/${ANDROID_MANIFEST_FILE}"
+        COMMENT "Updating Android project at ${path}. SDK target: ${android_proj_sdk_target}"
+        )
+
+    list(APPEND android_proj_file_deps ${android_proj_target_files})
+
+    # build native part
+    file(GLOB_RECURSE android_proj_jni_files "${path}/jni/*.c" "${path}/jni/*.h" "${path}/jni/*.cpp" "${path}/jni/*.hpp")
+    ocv_list_filterout(android_proj_jni_files "\\\\.svn")
+
+    if(android_proj_jni_files AND EXISTS ${path}/jni/Android.mk AND NOT DEFINED JNI_LIB_NAME)
+      # find local module name in Android.mk file to build native lib
+      file(STRINGS "${path}/jni/Android.mk" JNI_LIB_NAME REGEX "LOCAL_MODULE[ ]*:=[ ]*.*" )
+      string(REGEX REPLACE "LOCAL_MODULE[ ]*:=[ ]*([a-zA-Z_][a-zA-Z_0-9]*)[ ]*" "\\1" JNI_LIB_NAME "${JNI_LIB_NAME}")
+
+      if(JNI_LIB_NAME)
+        ocv_include_modules_recurse(${android_proj_NATIVE_DEPS})
+        ocv_include_directories("${path}/jni")
+
+        if(NATIVE_APP_GLUE)
+          include_directories(${ANDROID_NDK}/sources/android/native_app_glue)
+          list(APPEND android_proj_jni_files ${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c)
+          ocv_warnings_disable(CMAKE_C_FLAGS -Wstrict-prototypes -Wunused-parameter -Wmissing-prototypes)
+          set(android_proj_NATIVE_DEPS ${android_proj_NATIVE_DEPS} android)
+        endif()
+
+        add_library(${JNI_LIB_NAME} MODULE ${android_proj_jni_files})
+        target_link_libraries(${JNI_LIB_NAME} ${OPENCV_LINKER_LIBS} ${android_proj_NATIVE_DEPS})
+
+        set_target_properties(${JNI_LIB_NAME} PROPERTIES
+            OUTPUT_NAME "${JNI_LIB_NAME}"
+            LIBRARY_OUTPUT_DIRECTORY "${android_proj_bin_dir}/libs/${ANDROID_NDK_ABI_NAME}"
+            )
+
+        get_target_property(android_proj_jni_location "${JNI_LIB_NAME}" LOCATION)
+        if (NOT (CMAKE_BUILD_TYPE MATCHES "debug"))
+            add_custom_command(TARGET ${JNI_LIB_NAME} POST_BUILD COMMAND ${CMAKE_STRIP} --strip-unneeded "${android_proj_jni_location}")
+        endif()
+      endif()
+    endif()
+
+    # build java part
+    if(android_proj_IGNORE_JAVA)
+      add_custom_command(
+         OUTPUT "${android_proj_bin_dir}/bin/${target}-debug.apk"
+         COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug
+         COMMAND ${CMAKE_COMMAND} -E touch "${android_proj_bin_dir}/bin/${target}-debug.apk" # needed because ant does not update the timestamp of updated apk
+         WORKING_DIRECTORY "${android_proj_bin_dir}"
+         MAIN_DEPENDENCY "${android_proj_bin_dir}/${ANDROID_MANIFEST_FILE}"
+         DEPENDS ${android_proj_file_deps} ${JNI_LIB_NAME})
+    else()
+      add_custom_command(
+         OUTPUT "${android_proj_bin_dir}/bin/${target}-debug.apk"
+         COMMAND ${ANT_EXECUTABLE} -q -noinput -k debug
+         COMMAND ${CMAKE_COMMAND} -E touch "${android_proj_bin_dir}/bin/${target}-debug.apk" # needed because ant does not update the timestamp of updated apk
+         WORKING_DIRECTORY "${android_proj_bin_dir}"
+         MAIN_DEPENDENCY "${android_proj_bin_dir}/${ANDROID_MANIFEST_FILE}"
+         DEPENDS "${Wagic_BINARY_DIR}/bin/classes.jar.dephelper" opencv_java # as we are part of Wagic we can just force this dependency
+         DEPENDS ${android_proj_file_deps} ${JNI_LIB_NAME})
+    endif()
+
+    unset(JNI_LIB_NAME)
+
+    add_custom_target(${target} ALL SOURCES "${android_proj_bin_dir}/bin/${target}-debug.apk" )
+    if(NOT android_proj_IGNORE_JAVA)
+      add_dependencies(${target} opencv_java)
+    endif()
+    if(android_proj_native_deps)
+      add_dependencies(${target} ${android_proj_native_deps})
+    endif()
+
+    if(__android_project_chain)
+      add_dependencies(${target} ${__android_project_chain})
+    endif()
+    set(__android_project_chain ${target} CACHE INTERNAL "auxiliary variable used for Android progects chaining")
+
+    # put the final .apk to the Wagic's bin folder
+    add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${android_proj_bin_dir}/bin/${target}-debug.apk" "${Wagic_BINARY_DIR}/bin/${target}.apk")
+    if(INSTALL_ANDROID_EXAMPLES AND "${target}" MATCHES "^example-")
+      #apk
+      install(FILES "${Wagic_BINARY_DIR}/bin/${target}.apk" DESTINATION "samples" COMPONENT main)
+      get_filename_component(sample_dir "${path}" NAME)
+      #java part
+      list(REMOVE_ITEM android_proj_files ${ANDROID_MANIFEST_FILE})
+      foreach(f ${android_proj_files} ${ANDROID_MANIFEST_FILE})
+        get_filename_component(install_subdir "${f}" PATH)
+        install(FILES "${android_proj_bin_dir}/${f}" DESTINATION "samples/${sample_dir}/${install_subdir}" COMPONENT main)
+      endforeach()
+      #jni part + eclipse files
+      file(GLOB_RECURSE jni_files RELATIVE "${path}" "${path}/jni/*" "${path}/.cproject")
+      ocv_list_filterout(jni_files "\\\\.svn")
+      foreach(f ${jni_files} ".classpath" ".project" ".settings/org.eclipse.jdt.core.prefs")
+        get_filename_component(install_subdir "${f}" PATH)
+        install(FILES "${path}/${f}" DESTINATION "samples/${sample_dir}/${install_subdir}" COMPONENT main)
+      endforeach()
+      #update proj
+      if(android_proj_lib_deps_commands)
+        set(inst_lib_opt " --library ../../sdk/java")
+      endif()
+      install(CODE "EXECUTE_PROCESS(COMMAND ${ANDROID_EXECUTABLE} --silent update project --path . --target \"${android_proj_sdk_target}\" --name \"${target}\" ${inst_lib_opt}
+                                    WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/samples/${sample_dir}\"
+                                   )"  COMPONENT main)
+      #empty 'gen'
+      install(CODE "MAKE_DIRECTORY(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/samples/${sample_dir}/gen\")" COMPONENT main)
+    endif()
+  endif()
+endmacro() 

CMakeModules/FindAnt.cmake

@@ -0,0 +1,13 @@
+find_host_program(ANT_EXECUTABLE "ant")
+
+if(ANT_EXECUTABLE)
+    set(ANT_FOUND ON)
+else()
+    set(ANT_FOUND OFF)
+endif()
+
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ANT REQUIRED_VARS ANT_EXECUTABLE)
+mark_as_advanced(ANT_EXECUTABLE ANT_FOUND)

CMakeModules/FindOpenSL.cmake

@@ -0,0 +1,29 @@
+# - Find OpenSL (actually OpenSLES)
+# Find the OpenSLES includes and libraries
+#
+#  OPENSL_INCLUDE_DIR - where to find dsound.h
+#  OPENSL_LIBRARIES   - List of libraries when using dsound.
+#  OPENSL_FOUND       - True if dsound found.
+
+if(OPENSL_INCLUDE_DIR)
+    # Already in cache, be silent
+    set(OPENSL_FIND_QUIETLY TRUE)
+endif(OPENSL_INCLUDE_DIR)
+
+find_path(OPENSL_INCLUDE_DIR SLES/OpenSLES.h)
+
+find_library(OPENSL_LIBRARY NAMES OpenSLES)
+
+# Handle the QUIETLY and REQUIRED arguments and set OPENSL_FOUND to TRUE if
+# all listed variables are TRUE.
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OPENSL DEFAULT_MSG
+    OPENSL_INCLUDE_DIR OPENSL_LIBRARY)
+
+if(OPENSL_FOUND)
+    set(OPENSL_LIBRARIES ${OPENSL_LIBRARY})
+else(OPENSL_FOUND)
+    set(OPENSL_LIBRARIES)
+endif(OPENSL_FOUND)
+
+mark_as_advanced(OPENSL_INCLUDE_DIR OPENSL_LIBRARY) 

CMakeModules/FindOrBuild.cmake

@@ -0,0 +1,231 @@
+macro(FindOrBuildZipFS)
+    if(BUILD_ZIPFS)
+        add_subdirectory(
+            ${CMAKE_SOURCE_DIR}/thirdparty/zipFS 
+            ${CMAKE_BINARY_DIR}/thirdparty/zipFS)
+        set(ZIPFS_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/zipFS)
+        set(ZIPFS_LIBRARY zipFS)
+    else()
+        message(WARNING "ZIPFS must get build")
+    endif()
+endmacro()
+
+macro(FindOrBuildTinyXML)
+    if(BUILD_TINYXML)
+        add_definitions(-DTIXML_USE_STL)
+        add_subdirectory(
+            ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml
+            ${CMAKE_BINARY_DIR}/thirdparty/tinyxml)
+        set(TINYXML_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/tinyxml)
+        set(TINYXML_LIBRARIES tinyxml)
+    else()
+        find_package(TinyXML REQUIRED)
+    endif()
+endmacro()
+
+macro(FindOrBuildSDL2)
+    if(BUILD_SDL2)
+        if(WIN32)
+            #SDL2 DirectX build is somehow broken...
+            set(SDL_AUDIO FALSE)
+            set(SDL_JOYSTICK FALSE)
+            set(SDL_HAPTIC FALSE)
+            set(SDL_SHARED FALSE)
+        endif()
+        add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/SDL2)
+        set(SDL2_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/SDL2/include ${CMAKE_BINARY_DIR}/thirdparty/SDL2)
+        if(EMSCRIPTEN)
+            set(SDL2_LIBRARY SDL2-static)
+        else()
+            set(SDL2_LIBRARY SDL2)
+        endif()
+    elseif(NOT EMSCRIPTEN)
+        find_package(SDL2)
+    endif()
+endmacro()
+
+macro(FindOrBuildUNZIP)
+    if(BUILD_UNZIP)
+        add_subdirectory(
+            ${CMAKE_SOURCE_DIR}/thirdparty/unzip 
+            ${CMAKE_BINARY_DIR}/thirdparty/unzip)
+        set(UNZIP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/unzip)
+        set(UNZIP_LIBRARY unzip)
+    else()
+        message(WARNING "UNZIP must get build")
+    endif()
+endmacro()
+
+macro(FindOrBuildBoost)
+    if(PSP OR UNIX OR WIN32 OR IOS)
+        #the psp build does not need more than a few headers
+        #todo: remove from the repository
+        set(BOOST_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/thirdparty/Boost)    
+#    elseif(WIN32)
+        #set BOOST_ROOT to the root of boost
+#        set(Boost_USE_STATIC_LIBS ON)
+#        set(Boost_USE_MULTITHREADED ON)
+#        set(BOOST_ROOT $ENV{BOOST_ROOT})
+		
+#        set(BOOST_LIBRARYDIR ${BOOST_ROOT}/libs)
+#        set(BOOST_INCLUDEDIR ${BOOST_ROOT})
+        
+#		find_package(Boost COMPONENTS system thread date_time REQUIRED)
+#		if(NOT Boost_FOUND)
+#            message("Set the BOOST_ROOT environment variable to point to your boost installation.")
+#            message("We need system thread and date_time compiled static libs")
+#            message("These libs are compiler specific.")
+#		endif()
+#    elseif(UNIX AND NOT ANDROID)
+#        find_package(Boost COMPONENTS system thread date_time REQUIRED)
+    elseif(ANDROID)
+        #this is a hack. we compile a few boost libds directly into 
+        #the application. we should require static libs for android
+        #to be available. maybe we could add the build option to
+        #download and build a compatible boost version
+        find_path(BOOST_INCLUDE_DIRS NAMES bind.hpp HINTS $ENV{ANDROID_BOOST_ROOT} PATH_SUFFIXES boost)
+        
+        if(BOOST_INCLUDE_DIRS)
+            get_filename_component(BOOST_INCLUDE_DIRS ${BOOST_INCLUDE_DIRS} PATH)
+            set(ANDROID_BOOST_PTHREAD_SRC_DIR ${BOOST_INCLUDE_DIRS}/libs/thread/src/pthread)
+            set(ANDROID_BOOST_SYSTEM_SRC_DIR ${BOOST_INCLUDE_DIRS}/libs/system/src/)
+        else()
+            message(SEND_ERROR "We require a few boost sources to get compiled into wagic. Please point the ANDROID_BOOST_ROOT environment variable to a boost-source copy root.")
+        endif()
+    endif()
+endmacro()
+
+
+macro(FindOrBuildZLIB)
+    if(BUILD_ZLIB)
+        add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/zlib)
+        set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/thirdparty/zlib ${CMAKE_BINARY_DIR}/thirdparty/zlib)
+        set(ZLIB_LIBRARIES zlib)
+    else()
+        if(WIN32)
+            set(ZLIB_ROOT ${CMAKE_SOURCE_DIR}/thirdparty/binary/win)
+            find_package(ZLIB)
+        else()
+            if(backend_qt_console OR backend_qt_widget OR EMSCRIPTEN)
+        	set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/thirdparty/zlib)
+            else()
+                find_package(ZLIB)
+            endif()
+        endif()
+    endif()
+endmacro()
+
+macro(FindOrBuildGIF)
+    if(BUILD_GIF)
+        message(WARNING "GIF sources are currently not included within the wagic tree")
+    else()
+		if(PSP)
+			find_package(GIF)
+		endif()
+    endif()
+endmacro()
+
+macro(FindOrBuildJPEG)
+    if(BUILD_JPEG)
+        add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/libjpeg ${CMAKE_BINARY_DIR}/thirdparty/libjpeg)
+        set(JPEG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libjpeg)
+        set(JPEG_LIBRARY jpeg)
+    else()
+        if(WIN32)
+            #findJPEG does currently not provide prefix vars to guide it
+            find_path(JPEG_INCLUDE_DIR jpeglib.h HINTS ${CMAKE_SOURCE_DIR}/thirdparty/binary/win/include)
+            find_library(JPEG_LIBRARY NAMES libjpeg-static-mt HINTS ${CMAKE_SOURCE_DIR}/thirdparty/binary/win/lib)
+            
+            if(JPEG_INCLUDE_DIR AND JPEG_LIBRARY)
+                set(JPEG_FOUND ON)
+                mark_as_advanced(JPEG_INCLUDE_DIR JPEG_LIBRARY)
+            else()
+                message(FATAL_ERROR "Could not find JPEG on windows")
+            endif()
+        else()
+            find_package(JPEG)
+        endif()
+    endif()
+endmacro()
+
+macro(FindOrBuildPNG)
+    if(BUILD_PNG)
+        add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/libpng ${CMAKE_BINARY_DIR}/thirdparty/libpng)
+        set(PNG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/thirdparty/libpng)
+#        find_path(PNG_INCLUDE_DIRS NAMES png.h HINTS ${CMAKE_SOURCE_DIR}/thirdparty/libpng)
+        set(PNG_LIBRARIES png)
+    else()
+        if(WIN32)
+            #findPNG does currently not provide prefix vars. so we find
+            find_path(PNG_INCLUDE_DIRS png.h HINTS ${CMAKE_SOURCE_DIR}/thirdparty/binary/win/include)
+            find_library(PNG_LIBRARIES libpng HINTS ${CMAKE_SOURCE_DIR}/thirdparty/binary/win/lib)
+                    
+            if (PNG_LIBRARIES AND PNG_INCLUDE_DIRS)
+                set(PNG_FOUND ON)
+                mark_as_advanced(PNG_INCLUDE_DIRS PNG_LIBRARIES)
+            else()
+                message(FATAL_ERROR "Could not find PNG on windows")
+            endif()
+        else()
+            find_package(PNG)
+        endif()
+    endif()
+endmacro()
+
+macro(FindOrBuildFreetype)
+    if(PSP)
+        set(ENV{FREETYPE_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/include)
+        set(ENV{FREETYPE_LIBRARIES} freetype)
+    endif()
+endmacro()
+
+macro(FindOrBuildHgeTools)
+	if(PSP)
+		find_library(HGETOOLS_LIBRARY NAMES hgetools HINTS "${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/lib")
+		set(HGETOOLS_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/include")
+	endif()
+endmacro()
+
+macro(FindOrBuildMikMod)
+	if(PSP)
+		find_library(MIKMOD_LIBRARY NAMES mikmod HINTS "${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/lib")
+        set(MIKMOD_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/include")
+    endif()
+endmacro()
+
+macro(FindOrBuildQt)
+    if(backend_qt_console)
+        add_definitions(-DCONSOLE_CONFIG -DTESTSUITE)
+        find_package(Qt5Core REQUIRED)
+        find_package(Qt5 COMPONENTS Core Network Multimedia REQUIRED)
+    elseif(backend_qt_widget)
+        add_definitions(-DQT_WIDGET)
+        find_package(OpenGL REQUIRED)
+        find_package(X11 REQUIRED)
+        find_package(Qt5 COMPONENTS Core Gui OpenGL Network Multimedia REQUIRED)
+    endif()
+#    include(${QT_USE_FILE})
+endmacro()
+
+macro(FindOrBuildOpenGL)
+    if(backend_sdl OR backend_qt_console OR backend_qt_widget)
+        if(ANDROID)
+            #find openglesv on android
+            set(OPENGL_LIBRARIES "-ldl -lGLESv1_CM -lGLESv2 -llog -landroid")
+        elseif(EMSCRIPTEN)
+            set(OPENGL_LIBRARIES "")
+        else()
+            find_package(OpenGL)
+#            find_package(GLUT)
+        endif()
+    endif()
+endmacro()
+
+macro(FindOrBuildOpenSL)
+    find_package(OpenSL)
+endmacro()
+
+macro(FindOrBuildPSPSDK)
+    find_package(PSPSDK COMPONENTS psppower pspmpeg pspaudiocodec pspaudiolib pspaudio pspmp3 pspgum pspgu psprtc pspfpu REQUIRED)
+endmacro()
+

CMakeModules/FindPSPSDK.cmake

@@ -0,0 +1,62 @@
+# - Try to find PSPSDK
+# Once done this will define
+#  PSPSDK_FOUND - System has PSPSDK
+#  PSPSDK_INCLUDE_DIR - The PSPSDK include directories
+#  PSPSDK_LIB - The libraries requested with the components field
+#  PSPSDK_REQUIRED_LIB - The libriries the PSPSDK needs always
+#  PSPSDK_CFLAGS  - The CFLAGS to use
+#  PSPSDK_PATH - The output of psp-config --pspsdk-path
+#  PSPSDK_PREFIX - The output of psp-config --psp-prefix
+#  PSPSDK_CXX_COMPILER - The PSPSDK CXX Compilers path
+#  PSPSDK_CXX_LINKER - The PSPSDK CXX Linker command
+#  PSPSDK_FIXUP_IMPORTS_COMMAND - psp-fixup-imports command
+#  PSPSDK_PRXGEN_COMMAND - psp-prxgen command
+#  PSPSDK_PACK_PBP_COMMAND - pack-pbp command
+#  PSPSDK_MKSFO_COMMAND - mksfo command
+
+#find the psp-config progams absolute path
+#psp-config needs to be reachable via the system shell (PATH)
+find_program(PSP_CONFIG_PROGRAM psp-config)
+
+#TODO: check if something is REQUIRED and throw errors instead of messages        
+if(PSP_CONFIG_PROGRAM)
+    find_program(PSPSDK_CXX_COMPILER psp-g++)
+    find_program(PSPSDK_CXX_LINKER psp-gcc)
+    find_program(PSPSDK_FIXUP_IMPORTS_COMMAND psp-fixup-imports)
+    find_program(PSPSDK_PRXGEN_COMMAND psp-prxgen)
+    find_program(PSPSDK_PACK_PBP_COMMAND pack-pbp)
+    find_program(PSPSDK_MKSFO_COMMAND mksfo)
+
+    #ask psp-config for the 
+    execute_process(COMMAND psp-config --pspsdk-path OUTPUT_VARIABLE PSPSDK_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND psp-config --psp-prefix  OUTPUT_VARIABLE PSPSDK_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+	
+    set(PSPSDK_INCLUDE_DIR "${PSPSDK_PATH}/include")
+    
+    foreach(_COMPONENT ${PSPSDK_FIND_COMPONENTS})
+        find_library(PSPSDK_${_COMPONENT} NAMES ${_COMPONENT})
+        if(NOT PSPSDK_${_COMPONENT})
+            message(SEND_ERROR "PSPSDK: ${_COMPONENT} not found")
+        else()
+            set(PSPSDK_LIB ${PSPSDK_LIB} ${PSPSDK_${_COMPONENT}})
+        endif()
+    endforeach()
+    
+    #find libs which pspsdk does require to link even if the programs does not need one of them directly
+    foreach(_COMPONENT pspdebug pspdisplay pspge pspctrl pspsdk c pspnet pspnet_inet pspnet_apctl pspnet_resolver psputility pspuser)
+        find_library(PSPSDK_${_COMPONENT} NAMES ${_COMPONENT})
+        if(NOT PSPSDK_${_COMPONENT})
+            message(SEND_ERROR "PSPSDK: ${_COMPONENT} not found")
+        else()
+            set(PSPSDK_REQUIRED_LIB ${PSPSDK_REQUIRED_LIB} ${PSPSDK_${_COMPONENT}})
+        endif()
+    endforeach()
+endif()
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(PSPSDK  DEFAULT_MSG
+                                  PSPSDK_CXX_LINKER PSPSDK_CXX_COMPILER PSPSDK_PATH PSPSDK_PREFIX PSPSDK_LIB PSPSDK_REQUIRED_LIB PSPSDK_INCLUDE_DIR)
+
+mark_as_advanced(PSPSDK_CXX_LINKER PSPSDK_CXX_COMPILER PSPSDK_PATH PSPSDK_PREFIX PSPSDK_LIB PSPSDK_REQUIRED_LIB PSPSDK_INCLUDE_DIR)

CMakeModules/FindSDL2.cmake

@@ -0,0 +1,181 @@
+ 
+# Locate SDL2 library
+# This module defines
+# SDL2_LIBRARY, the name of the library to link against
+# SDL2_FOUND, if false, do not try to link to SDL2
+# SDL2_INCLUDE_DIR, where to find SDL.h
+#
+# This module responds to the the flag:
+# SDL2_BUILDING_LIBRARY
+# If this is defined, then no SDL2_main will be linked in because
+# only applications need main().
+# Otherwise, it is assumed you are building an application and this
+# module will attempt to locate and set the the proper link flags
+# as part of the returned SDL2_LIBRARY variable.
+#
+# Don't forget to include SDL2main.h and SDL2main.m your project for the
+# OS X framework based version. (Other versions link to -lSDL2main which
+# this module will try to find on your behalf.) Also for OS X, this
+# module will automatically add the -framework Cocoa on your behalf.
+#
+#
+# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
+# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
+# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
+# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
+# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
+# as appropriate. These values are used to generate the final SDL2_LIBRARY
+# variable, but when these values are unset, SDL2_LIBRARY does not get created.
+#
+#
+# $SDL2DIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDL2DIR
+# used in building SDL2.
+# l.e.galup  9-20-02
+#
+# Modified by Eric Wing.
+# Added code to assist with automated building by using environmental variables
+# and providing a more controlled/consistent search behavior.
+# Added new modifications to recognize OS X frameworks and
+# additional Unix paths (FreeBSD, etc).
+# Also corrected the header search path to follow "proper" SDL2 guidelines.
+# Added a search for SDL2main which is needed by some platforms.
+# Added a search for threads which is needed by some platforms.
+# Added needed compile switches for MinGW.
+#
+# On OSX, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of
+# SDL2_LIBRARY to override this selection or set the CMake environment
+# CMAKE_INCLUDE_PATH to modify the search paths.
+#
+# Note that the header path has changed from SDL2/SDL.h to just SDL.h
+# This needed to change because "proper" SDL2 convention
+# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
+# reasons because not all systems place things in SDL2/ (see FreeBSD).
+#
+# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
+# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
+# was not created for redistribution, and exists temporarily pending official
+# SDL2 CMake modules.
+
+#=============================================================================
+# Copyright 2003-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+FIND_PATH(SDL2_INCLUDE_DIR SDL.h
+  HINTS
+  $ENV{SDL2DIR}
+  PATH_SUFFIXES include/SDL2 include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local/include/SDL2
+  /usr/include/SDL2
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+FIND_LIBRARY(SDL2_LIBRARY_TEMP
+  NAMES SDL2
+  HINTS
+  $ENV{SDL2DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
+
+IF(NOT SDL2_BUILDING_LIBRARY)
+  IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+    # Non-OS X framework versions expect you to also dynamically link to
+    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
+    # seem to provide SDL2main for compatibility even though they don't
+    # necessarily need it.
+    FIND_LIBRARY(SDL2MAIN_LIBRARY
+      NAMES SDL2main
+      HINTS
+      $ENV{SDL2DIR}
+      PATH_SUFFIXES lib64 lib
+      PATHS
+      /sw
+      /opt/local
+      /opt/csw
+      /opt
+    )
+  ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
+ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+# SDL2 may require threads on your system.
+# The Apple build may not need an explicit flag because one of the
+# frameworks may already provide it.
+# But for non-OSX systems, I will use the CMake Threads package.
+IF(NOT APPLE)
+  FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
+# MinGW needs an additional library, mwindows
+# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
+# (Actually on second look, I think it only needs one of the m* libraries.)
+IF(MINGW)
+  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+ENDIF(MINGW)
+
+SET(SDL2_FOUND "NO")
+IF(SDL2_LIBRARY_TEMP)
+  # For SDL2main
+  IF(NOT SDL2_BUILDING_LIBRARY)
+    IF(SDL2MAIN_LIBRARY)
+      SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
+    ENDIF(SDL2MAIN_LIBRARY)
+  ENDIF(NOT SDL2_BUILDING_LIBRARY)
+
+  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
+  # CMake doesn't display the -framework Cocoa string in the UI even
+  # though it actually is there if I modify a pre-used variable.
+  # I think it has something to do with the CACHE STRING.
+  # So I use a temporary variable until the end so I can set the
+  # "real" variable in one-shot.
+  IF(APPLE)
+    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
+  ENDIF(APPLE)
+
+  # For threads, as mentioned Apple doesn't need this.
+  # In fact, there seems to be a problem if I used the Threads package
+  # and try using this line, so I'm just skipping it entirely for OS X.
+  IF(NOT APPLE)
+    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+  ENDIF(NOT APPLE)
+
+  # For MinGW library
+  IF(MINGW)
+    SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
+  ENDIF(MINGW)
+
+  # Set the final string here so the GUI reflects the final state.
+  SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
+  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
+  SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
+
+  SET(SDL2_FOUND "YES")
+ENDIF(SDL2_LIBRARY_TEMP)
+
+INCLUDE(FindPackageHandleStandardArgs)
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
+                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+mark_as_advanced(SDL2MAIN_LIBRARY SDL2_LIBRARY SDL2_INCLUDE_DIR)

CMakeModules/FindTinyXML.cmake

@@ -0,0 +1,26 @@
+# - Find TinyXML
+# Find the native TinyXML includes and library
+#
+#   TINYXML_FOUND       - True if TinyXML found.
+#   TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
+#   TINYXML_LIBRARIES   - List of libraries when using TinyXML.
+#
+
+IF( TINYXML_INCLUDE_DIR )
+    # Already in cache, be silent
+    SET( TinyXML_FIND_QUIETLY TRUE )
+ENDIF( TINYXML_INCLUDE_DIR )
+
+FIND_PATH( TINYXML_INCLUDE_DIR "tinyxml.h"
+           PATH_SUFFIXES "tinyxml" )
+
+FIND_LIBRARY( TINYXML_LIBRARIES
+              NAMES "tinyxml"
+              PATH_SUFFIXES "tinyxml" )
+
+# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE( "FindPackageHandleStandardArgs" )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )
+
+MARK_AS_ADVANCED( TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )

CMakeModules/ios-theos.toolchain.cmake

@@ -0,0 +1,48 @@
+include(CMakeForceCompiler)
+
+# this one is important
+SET(CMAKE_SYSTEM_NAME "Generic")
+#this one not so much
+SET(CMAKE_SYSTEM_VERSION 1)
+
+set (CMAKE_SYSTEM_NAME Generic)
+
+# Just point to anything that exists. 
+# We don't need CMake to generate proper build files.
+set(CMAKE_C_COMPILER ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_CXX_COMPILER ${CMAKE_CURRENT_SOURCE_DIR})
+
+# Skip the platform compiler checks
+set (CMAKE_CXX_COMPILER_WORKS TRUE)
+set (CMAKE_C_COMPILER_WORKS TRUE)
+
+#how libraries look
+SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a")
+
+SET(CMAKE_SYSTEM_INCLUDE_PATH 
+	${THEOS_PATH}/include 
+	${CMAKE_INSTALL_PREFIX}/include
+	${CMAKE_SYSTEM_INCLUDE_PATH})
+
+# where is the target environment 
+SET(CMAKE_SYSTEM_LIBRARY_PATH 
+	${THEOS_PATH}/lib 
+	${CMAKE_INSTALL_PREFIX}/lib
+	${CMAKE_SYSTEM_LIBRARY_PATH})
+
+
+SET(CMAKE_FIND_ROOT_PATH  
+	${CMAKE_SOURCE_DIR}
+	${THEOS_PATH}
+	${THEOS_PATH}/lib
+	${THEOS_PATH}/include
+	)
+
+# search for programs in the build host directories
+# for libraries and headers in the target directories and then in the host
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY FIRST)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE FIRST)
+
+set(IOS 1)

CMakeModules/psp.toolchain.cmake

@@ -0,0 +1,62 @@
+include(CMakeForceCompiler)
+
+# this one is important
+SET(CMAKE_SYSTEM_NAME "Generic")
+#this one not so much
+SET(CMAKE_SYSTEM_VERSION 1)
+
+find_program(PSP_CONFIG_PROGRAM psp-config)
+
+execute_process(COMMAND psp-config --pspsdk-path OUTPUT_VARIABLE PSPSDK_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND psp-config --psp-prefix  OUTPUT_VARIABLE PSPSDK_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+	
+# specify compiler and linker:
+find_program(PSP_GPP psp-g++)
+find_program(PSP_GCC psp-gcc)
+
+CMAKE_FORCE_C_COMPILER(${PSP_GCC} GNU)
+CMAKE_FORCE_CXX_COMPILER(${PSP_GPP} GNU)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -G0")
+
+set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
+set(CMAKE_CXX_LINK_EXECUTABLE "${PSP_GCC} <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <FLAGS> <OBJECTS>  -o <TARGET> <LINK_LIBRARIES>")
+
+#how libraries look
+SET(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".a")
+
+# where is the target environment 
+SET(CMAKE_SYSTEM_INCLUDE_PATH 
+	${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/include 
+	${PSPSDK_PATH}/include 
+	${PSPSDK_PREFIX}/include 
+	${CMAKE_INSTALL_PREFIX}/include
+	${CMAKE_SYSTEM_INCLUDE_PATH})
+	
+SET(CMAKE_SYSTEM_LIBRARY_PATH 
+	${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/lib 
+	${PSPSDK_PATH}/lib 
+	${PSPSDK_PREFIX}/lib
+	${CMAKE_INSTALL_PREFIX}/lib
+	${CMAKE_SYSTEM_LIBRARY_PATH})
+
+SET(CMAKE_FIND_ROOT_PATH  
+	${CMAKE_SOURCE_DIR}/thirdparty/binary/psp
+	${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/lib
+	${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/include
+	${PSPSDK_PATH}
+	${PSPSDK_PATH}/lib
+	${PSPSDK_PATH}/include
+	${PSPSDK_PREFIX}
+	${PSPSDK_PREFIX}/lib
+	${PSPSDK_PREFIX}/include
+	)
+
+# search for programs in the build host directories
+# for libraries and headers in the target directories and then in the host
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY FIRST)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE FIRST)
+
+set(PSP 1)

CMakeModules/utils.cmake

@@ -0,0 +1,57 @@
+macro(WAGIC_OPTION variable description value)
+  set(__value ${value})
+  set(__condition "")
+  set(__varname "__value")
+  foreach(arg ${ARGN})
+    if(arg STREQUAL "IF" OR arg STREQUAL "if")
+      set(__varname "__condition")
+    else()
+      list(APPEND ${__varname} ${arg})
+    endif()
+  endforeach()
+  unset(__varname)
+  if("${__condition}" STREQUAL "")
+    set(__condition 2 GREATER 1)
+  endif()
+
+  if(${__condition})
+    if("${__value}" MATCHES ";")
+      if(${__value})
+        option(${variable} "${description}" ON)
+      else()
+        option(${variable} "${description}" OFF)
+      endif()
+    elseif(DEFINED ${__value})
+      if(${__value})
+        option(${variable} "${description}" ON)
+      else()
+        option(${variable} "${description}" OFF)
+      endif()
+    else()
+      option(${variable} "${description}" ${__value})
+    endif()
+  else()
+    unset(${variable} CACHE)
+  endif()
+  unset(__condition)
+  unset(__value)
+endmacro() 
+
+# add prefix to each item in the list
+macro(list_add_prefix LST PREFIX)
+  set(__tmp "")
+  foreach(item ${${LST}})
+    list(APPEND __tmp "${PREFIX}${item}")
+  endforeach()
+  set(${LST} ${__tmp})
+  unset(__tmp)
+endmacro()
+
+
+macro(find_host_program)
+    set(_find_program ${CMAKE_FIND_ROOT_PATH_MODE_PROGRAM})
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+    find_program(${ARGN})
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ${_find_program})
+    unset(_find_program)
+endmacro()

JGE/CMakeLists.txt

@@ -0,0 +1,165 @@
+#the sources, jge will need always
+set(JGE_generic_src
+        src/Encoding.cpp
+        src/JAnimator.cpp
+        src/JApp.cpp
+        src/JDistortionMesh.cpp
+        src/JFileSystem.cpp
+        src/JGameObject.cpp
+        src/JGE.cpp
+        src/JGui.cpp
+        src/JLogger.cpp
+        src/JLBFont.cpp
+        src/JOBJModel.cpp
+        src/JParticle.cpp
+        src/JParticleEffect.cpp
+        src/JParticleEmitter.cpp
+        src/JParticleSystem.cpp
+        src/JResourceManager.cpp
+        src/JSpline.cpp
+        src/JSprite.cpp
+        src/Vector2D.cpp)
+
+set(JGE_hge_src
+        src/hge/hgecolor.cpp
+        src/hge/hgedistort.cpp
+        src/hge/hgefont.cpp
+        src/hge/hgeparticle.cpp
+        src/hge/hgerect.cpp
+        src/hge/hgevector.cpp)
+
+#the sources we need to get graphical output desktops
+#used by qt-widget build option
+set(JGE_graphics_src
+        src/Downloader.cpp
+        include/Downloader.h
+        src/JMD2Model.cpp
+        src/pc/JGfx.cpp)
+
+#the sources we need to fake graphical output on desktops
+#these are used for the console-only testsuit
+set(JGE_console_src
+        src/OutputCapturer.cpp
+        src/JGfx-fake.cpp)
+
+#the sources we need on linux
+set(JGE_linux_src
+        src/JNetwork.cpp
+        src/pc/JSocket.cpp
+        src/pc/JSfx.cpp)
+        
+set(JGE_android_src
+        src/JNetwork.cpp
+        src/JSocket.cpp
+        src/android/JSfx.cpp)
+
+#the sources we need if we compile for psp
+#note: main.cpp contains the main-function.
+#the other main functions reside in projects/mtg to reduce cross-library dependencies.
+#there may be a way to get all main-functions into the same project
+set(JGE_psp_src
+        src/JNetwork.cpp
+        src/JSocket.cpp
+        src/JGfx.cpp
+        src/JSfx.cpp
+        src/JAudio.cpp
+        src/JMP3.cpp
+        src/decoder_prx.cpp
+        src/main.cpp
+        src/vram.cpp)
+
+set(JGE_ios_src
+	src/iOS/main.m
+	src/iOS/wagicAppDelegate.m
+	src/iOS/ES2Renderer.m
+	src/iOS/EAGLView.m
+	src/iOS/EAGLViewController.m
+	src/iOS/JSfx.cpp)
+
+set(JGE_windows_src
+        src/JNetwork.cpp
+        src/pc/JSocket.cpp
+	src/windows/JSfx.cpp)
+
+set(JGE_INCLUDE_DIRS include include/hge)
+set(EXTRA_INCLUDE_DIR ../projects/mtg/extra)
+
+#turn moc on
+if(backend_qt_console OR backend_qt_widget)
+    set(CMAKE_INCLUDE_CURRENT_DIR ON)
+    set(CMAKE_AUTOMOC TRUE)
+endif()
+
+
+if(backend_qt_console)
+    if(UNIX AND NOT ANDROID)
+        set(JGE_INTERNAL_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} ${ZIPFS_INCLUDE_DIR} 
+            ${UNZIP_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${Qt5Core_INCLUDE_DIRS} ${Qt5Multimedia_INCLUDE_DIRS})
+        set(JGE_SOURCES ${JGE_generic_src} ${JGE_console_src} ${JGE_linux_src} ${JGE_hge_src})
+        set(JGE_LINK_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${ZIPFS_LIBRARY} ${UNZIP_LIRARY}
+            ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
+    else()
+        message(FATAL_ERROR "qt builds of jge platforms other than linux are not supported")
+    endif()
+endif()
+
+if(backend_qt_widget)
+    if(UNIX AND NOT ANDROID)
+        set(JGE_INTERNAL_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} ${ZIPFS_INCLUDE_DIR} 
+            ${UNZIP_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${Qt5Core_INCLUDE_DIRS} ${Qt5Multimedia_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS} )
+        set(JGE_SOURCES ${JGE_generic_src} ${JGE_graphics_src} ${JGE_linux_src} ${JGE_hge_src})
+        set(JGE_LINK_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${ZIPFS_LIBRARY} ${UNZIP_LIRARY}
+            ${JPEG_LIBRARIES} ${PNG_LIBRARIES})
+    else()
+        message(FATAL_ERROR "qt builds of jge platforms other than linux are not supported")
+    endif()
+endif()
+
+if(backend_sdl)
+    if((UNIX OR EMSCRIPTEN) AND NOT ANDROID)
+        set(JGE_INTERNAL_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} ${ZIPFS_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}  ${GLUT_INCLUDE_DIR}
+            ${SDL2_INCLUDE_DIR} ${UNZIP_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
+        set(JGE_SOURCES ${JGE_generic_src} ${JGE_graphics_src} ${JGE_linux_src} ${JGE_hge_src})
+        set(JGE_LINK_LIBRARIES ${ZIPFS_LIBRARY} ${UNZIP_LIRARY} ${JPEG_LIBRARY} 
+            ${PNG_LIBRARIES} ${OPENGL_LIBRARIES} ${GLUT_LIBRARY})
+    elseif(ANDROID)
+        set(JGE_INTERNAL_INCLUDE_DIRS ${BOOST_INCLUDE_DIRS} ${TINYXML_INCLUDE_DIR} ${ZIPFS_INCLUDE_DIR}     
+            ${SDL2_INCLUDE_DIR} ${UNZIP_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR} 
+            ${OPENSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
+        set(JGE_SOURCES ${JGE_generic_src} ${JGE_android_src} ${JGE_graphics_src} ${JGE_hge_src})
+        set(JGE_LINK_LIBRARIES ${ZIPFS_LIBRARY} ${UNZIP_LIRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} 
+            ${OPENSL_LIBRARIES}) 
+    elseif(WIN32)
+        set(JGE_INTERNAL_INCLUDE_DIRS ${EXTRA_INCLUDE_DIR} ${TINYXML_INCLUDE_DIR} ${ZIPFS_INCLUDE_DIR} ${SDL2_INCLUDE_DIR} 
+            ${UNZIP_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/thirdparty/binary/win/include)
+        set(JGE_SOURCES ${JGE_generic_src} ${JGE_graphics_src} ${JGE_windows_src} ${JGE_hge_src})
+        set(JGE_LINK_LIBRARIES ${ZIPFS_LIBRARY} ${UNZIP_LIRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES})
+        set(JGE_LINK_DIRECTORIES ${Boost_LIBRARY_DIR})
+    endif()
+endif()
+
+if(backend_psp)
+    if(PSP)        
+        #${PSPSDK_PATH}/include should be in system pathes
+        set(JGE_INTERNAL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/thirdparty/psp/include ${TINYXML_INCLUDE_DIR} 
+            ${ZIPFS_INCLUDE_DIR} ${UNZIP_INCLUDE_DIR} ${BOOST_INCLUDE_DIRS} ${GIF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS} )
+        set(JGE_SOURCES ${JGE_generic_src} ${JGE_psp_src} ${JGE_hge_src})
+        set(JGE_LINK_LIBRARIES ${TINYXML_LIBRARIES} ${ZIPFS_LIBRARY} ${UNZIP_LIRARY})
+    else()
+        message(FATAL_ERROR "use the cross-compile toolchain to build as the psp target")
+    endif()
+endif()
+
+if(IOS)
+    set(JGE_SOURCES ${JGE_generic_src} ${JGE_ios_src} ${JGE_hge_src} src/pc/JGfx.cpp)
+    set(JGE_SOURCES ${JGE_SOURCES} PARENT_SCOPE)
+    set(JGE_INCLUDE_DIRS ${JGE_INCLUDE_DIRS} src/iOS PARENT_SCOPE)
+    set(JGE_LINK_LIBRARIES ${TINYXML_LIBRARIES} ${ZIPFS_LIBRARY} ${UNZIP_LIRARY})
+endif()
+
+add_library(jge STATIC ${JGE_SOURCES})
+include_directories(${JGE_INTERNAL_INCLUDE_DIRS} ${JGE_INCLUDE_DIRS})
+target_link_libraries(jge ${JGE_LINK_LIBRARIES})
+link_directories(${JGE_LINK_DIRECTORIES})
+
+set(${JGE_LIBRARIES} jge)

JGE/JGE.vcxproj

@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>src/zipFS;Dependencies/SDL/include;Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SDL_CONFIG;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TIXML_USE_STL; SDL_CONFIG;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -101,7 +101,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>src/zipFS;Dependencies/SDL/include;Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SDL_CONFIG;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TIXML_USE_STL; SDL_CONFIG;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -129,7 +129,7 @@
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>src/zipFS;Dependencies/SDL/include;Dependencies/include;$(JGEEXTRAS);../Boost;../projects/mtg/include;include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SDL_CONFIG;WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_HAS_ITERATOR_DEBBUGING=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>TIXML_USE_STL; SDL_CONFIG;WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_HAS_ITERATOR_DEBBUGING=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>

JGE/Makefile

@@ -31,6 +31,8 @@ HGE_OBJS = src/hge/hgecolor.o src/hge/hgeparticle.o \
 
 
 CXXFLAGS = -W -Wall -Werror -Wno-unused
+CXXFLAGS += -DTIXML_USE_STL
+CXXFLAGS += -Wno-deprecated-declarations -Wno-sign-compare
 
 ifdef DEBUG
 CXXFLAGS += -ggdb3
@@ -81,7 +83,7 @@ ifeq ($(TARGET_ARCHITECTURE),linux)
 OBJS = $(GENERIC_OBJS) $(LINUX_OBJS)
 TARGET_LIB = libjge.a
 TARGET_HGE = libhgetools.a
-INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include -I../Boost -Isrc/zipFS -Iinclude/
+INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include -I/usr/include/boost -Isrc/zipFS -Iinclude/
 CXXFLAGS += -DLINUX $(FMOD)
 CXXFLAGS += $(INCDIR)
 LIBDIR = lib/linux

JGE/include/DebugRoutines.h

@@ -4,6 +4,8 @@
 // dirty, but I get OS header includes this way
 #include "JGE.h"
 
+#include "OutputCapturer.h"
+
 #include <ostream>
 #include <iostream>
 #include <iomanip>
@@ -16,39 +18,51 @@ using namespace std;
 template <class T>
 std::string ToHex(T* pointer)
 {
-    std::ostringstream stream;
-    stream << hex << showbase << setfill('0') << setw(8) << (uint64_t) pointer;
-    return stream.str();
+	std::ostringstream stream;
+	stream << hex << showbase << setfill('0') << setw(8) << (uint64_t) pointer;
+	return stream.str();
 }
 
 #ifdef LINUX
 #define OutputDebugString(val) (std::cerr << val);
+#define OutputDebugStringA(val) (std::cerr << val);
 #endif
 
 #ifdef _DEBUG
 #if defined (WIN32) || defined (LINUX)
 
 #ifdef QT_CONFIG
-#define DebugTrace(inString)								\
-{															\
-  std::ostringstream stream;								\
-  stream << inString << std::endl;					    \
-  qDebug(stream.str().c_str());	                        \
-}
-#elif defined (ANDROID)
-#include <android/log.h>
+
+#ifdef CAPTURE_STDERR
 #define DebugTrace(inString)								\
 {															\
   std::ostringstream stream;								\
   stream << inString;					    \
-  __android_log_write(ANDROID_LOG_DEBUG, "Wagic", stream.str().c_str());\
+  OutputCapturer::add(stream.str()); \
+}
+#else // CAPTURE_STDERR
+#define DebugTrace(inString)								\
+{															\
+	std::ostringstream stream;								\
+	stream << inString;					    \
+	qDebug("%s", stream.str().c_str()); \
+}
+#endif // CAPTURE_STDERR
+
+#elif defined (ANDROID)
+#include <android/log.h>
+#define DebugTrace(inString)								\
+{															\
+	std::ostringstream stream;								\
+	stream << inString;					    \
+	__android_log_write(ANDROID_LOG_DEBUG, "Wagic", stream.str().c_str());\
 }
 #else
 #define DebugTrace(inString)								\
 {															\
 	std::ostringstream stream;								\
 	stream << inString << std::endl;					    \
-  OutputDebugString(stream.str().c_str());  \
+	OutputDebugStringA(stream.str().c_str());  \
 }
 #endif // QT_CONFIG
 #endif // Win32, Linux
@@ -58,7 +72,7 @@ std::string ToHex(T* pointer)
 #ifndef DebugTrace
 #define DebugTrace(inString)								\
 {															\
-  std::cerr << inString << std::endl;					    \
+	std::cerr << inString << std::endl;					    \
 }
 #endif //DEBUG
 #endif

JGE/include/Downloader.h

@@ -0,0 +1,134 @@
+#ifndef DOWNLOADER_H
+#define DOWNLOADER_H
+
+//-------------------------------------------------------------------------------------
+//
+// This class handles download of remote resources (any kind of file)
+// All the resources are stored locally in the userPath
+// For every resources, the downloader verifies if the resource was modifed
+// on the server before downloading the update. The Downloader maintains a catalogue
+// of resource downloaded to be able to check if they need to be updated.
+//
+// The interface can be used completly synchronously by the application and some
+// context or message loop is needed in the implementation of this interface
+//
+// Note that the Downloader could in theory by implemented on top of JNetwork.
+//
+//-------------------------------------------------------------------------------------
+#include <string>
+#include <ostream>
+#include <istream>
+#include <fstream>
+#include <map>
+#include "Threading.h"
+#ifdef QT_CONFIG
+#include <QObject>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QNetworkAccessManager>
+#endif
+
+using namespace std;
+
+class DownloadRequest
+        #ifdef QT_CONFIG
+        : public QObject
+        #endif
+{
+#ifdef QT_CONFIG
+    Q_OBJECT
+
+private slots:
+#endif
+    void fileDownloaded();
+    void downloadProgress(int64_t bytesReceived, int64_t bytesTotal);
+
+#ifdef QT_CONFIG
+signals:
+    void percentChanged(int percent);
+    void statusChanged(int);
+#endif
+
+public:
+    typedef enum {
+        NOT_PRESENT,
+        DOWNLOADING,
+        DOWNLOADED,
+        DOWNLOAD_ERROR
+    } DownloadStatus;
+
+protected:
+    string mLocalPath;
+    string mRemoteResourceURL;
+    // previous one is the original, next one can change after redirection
+    string mRequestedRemoteResourceURL;
+    string mETag;
+    DownloadStatus mDownloadStatus;
+    bool mUpgradeAvailable;
+    size_t mTotalSize;
+    size_t mCurrentSize;
+    ofstream mFile;
+#ifdef QT_CONFIG
+    QNetworkReply* mNetworkReply;
+    static QNetworkAccessManager networkAccessManager;
+#endif
+#ifdef __EMSCRIPTEN__
+  static void onLoadCb(unsigned int handle, DownloadRequest* req, const char *buffer, unsigned int size);
+  static void onErrorCb(unsigned int handle, DownloadRequest* req, int errorCode, const char* errorText);
+  static void onProgressCb(unsigned int handle, DownloadRequest* req, int bytesReceived, int bytesTotal);
+#endif
+  void processError(int errorCode, const char* errorText);
+  void processBufferDownloaded(unsigned int size, const char*buffer);
+
+public:
+    DownloadRequest(string localPath="",
+                    string remoteResourceURL="",
+                    string ETag = "",
+                    DownloadStatus downloadStatus=NOT_PRESENT,
+                    size_t totalSize = 0,
+                    size_t currentSize = 0);
+    ~DownloadRequest();
+    static bool NetworkIsAccessible();
+
+    string getTempLocalPath() const { return (mLocalPath+".tmp"); };
+    string getLocalPath() const { return mLocalPath; };
+    string getRemoteResource() const { return mRemoteResourceURL; };
+    string getETag() const { return mETag; };
+    void startGet();
+    void startHead();
+    DownloadStatus getDownloadStatus() const { return mDownloadStatus; };
+    bool upgradeAvailable() const { return mUpgradeAvailable; };
+    void getSizes(size_t& totalSize, size_t&currentSize) {
+        totalSize = mTotalSize;
+        currentSize = mCurrentSize;
+    };
+
+    friend ostream& operator<<(ostream& out, const DownloadRequest& d);
+    friend istream& operator>>(istream&, DownloadRequest&);
+    friend class Downloader;
+};
+
+
+class Downloader
+{
+protected:
+    Downloader(string globalRemoteURL="", string localCacheRecords="");
+    virtual ~Downloader();
+    static Downloader* mInstance;
+    string mGlobalRemoteURL;
+    string mLocalCacheRecords;
+    boost::mutex mMutex;
+    map<string, DownloadRequest*> mRequestMap;
+
+public:
+    static Downloader* GetInstance();
+    static void Release();
+
+    void Update();
+    DownloadRequest* Get(string localPath, string remoteResourceURL="");
+
+    friend ostream& operator<<(ostream& out, const Downloader& d);
+    friend istream& operator>>(istream&, Downloader&);
+};
+
+#endif // DOWNLOADER_H

JGE/include/JAnimator.h

@@ -297,7 +297,6 @@ public:
 private:
 	float mTimer;
 	float mFrameTime;
-	JAnimator* mAnimator;
 	vector<JAnimatorObject *> mObjects;
 
 };

JGE/include/JDistortionMesh.h

@@ -37,7 +37,6 @@ private:
 	float mTexY;
 	float mTexWidth;
 	float mTexHeight;
-	JTexture* mTexture;
 	JQuad* mQuad;
 	
 	

JGE/include/JFileSystem.h

@@ -128,6 +128,7 @@ public:
     bool readIntoString(const string & FilePath, string & target);
     bool openForWrite(ofstream & File, const string & FilePath, ios_base::openmode mode = ios_base::out );
     bool Rename(string from, string to);
+    bool Remove(string aFile);
 
     //Returns true if strFilename exists somewhere in the fileSystem
     bool FileExists(const string& strFilename);
@@ -163,4 +164,4 @@ protected:
 
 
 
-#endif
+#endif

JGE/include/JGE.h

@@ -31,7 +31,7 @@ typedef u32 LocalKeySym;
 
 #elif defined(SDL_CONFIG)
 #include <SDL.h>
-typedef SDLKey LocalKeySym;
+typedef SDL_Keycode LocalKeySym;
 #define LOCAL_KEY_NONE SDLK_UNKNOWN
 
 #elif defined(WIN32)
@@ -44,6 +44,17 @@ typedef WPARAM LocalKeySym;
 #include <X11/keysym.h>
 typedef KeySym LocalKeySym;
 #define LOCAL_KEY_NONE XK_VoidSymbol
+#undef Status
+#undef Bool
+#undef None
+#undef CursorShape
+#undef KeyPress
+#undef KeyRelease
+#undef FocusIn
+#undef FocusOut
+#undef FontChange
+#undef Unsorted
+#undef GrayScale
 
 #elif defined(ANDROID) // This is temporary until we understand how to send real key events from Java
 typedef long unsigned int LocalKeySym;

JGE/include/JGui.h

@@ -61,7 +61,7 @@ public:
     virtual bool ButtonPressed(); // action button pressed, return false to ignore
 
     // Used for mouse support so that the GUI engine can found out which Object was selected
-    virtual bool getTopLeft(float& top, float& left)
+    virtual bool getTopLeft(float&, float&)
     {
         return false;
     }
@@ -104,7 +104,7 @@ public:
     int mCount;
 
     JGuiController(JGE* jge, int id, JGuiListener* listener);
-    ~JGuiController();
+    virtual ~JGuiController();
 
     virtual void Render();
     virtual void Update(float dt);

JGE/include/JLBFont.h

@@ -172,13 +172,12 @@ private:
 
 	float		mHeight;
 	float		mScale;
+	float		mTextureScale;
 	float		mRotation;
 	float		mTracking;
 	float       mSpacing;
 
 	PIXEL_TYPE		mColor;
-	int			mBlend;
-
 	int			mBase;
 
 };

JGE/include/JNetwork.h

@@ -13,34 +13,42 @@ class JSocket;
 #include <sstream>
 #include "Threading.h"
 
-typedef void(*processCmd)(istream&, ostream&);
+typedef void(*processCmd)(void*, stringstream&, stringstream&);
 
 class JNetwork {
 private:
+private:
+  boost::thread *mpWorkerThread;
+	struct CommandStruc{
+		void* object;
+		string command;
+		processCmd processCommand;
+	};
+
+  string serverIP;
   int connected_to_ap;
   JSocket* socket;
   boost::mutex sendMutex;
   boost::mutex receiveMutex;
   stringstream received;
   stringstream toSend;
-  static map<string, processCmd> sCommandMap;
+  static map<string, CommandStruc> sCommandMap;
 
 public:
   JNetwork();
   ~JNetwork();
-  string serverIP;
+  void Update();
+  void getServerIp(string& aString);
 
-  int connect(string serverIP = "");
+  int connect(const string& serverIP = "");
   bool isConnected();
+  bool isServer() { return serverIP == ""; };
   static void ThreadProc(void* param);
 #if !defined (WIN32) && !defined (LINUX)
   static int connect_to_apctl(int config);
 #endif
-  bool sendCommand(string command);
-  static void registerCommand(string command, processCmd processCommand, processCmd processResponse);
-
-private:
-  boost::thread *mpWorkerThread;
+  bool sendCommand(const string& command, const string& payload = "", const string& suffix = "Request");
+  static void registerCommand(string command, void* object, processCmd processRequest, processCmd processResponse);
 };
 
 #endif

JGE/include/JRenderer.h

@@ -16,7 +16,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#if (!defined IOS) && (!defined ANDROID) && (!defined QT_CONFIG)
+#if (!defined IOS) && (!defined ANDROID) && (!defined QT_CONFIG) && (!defined SDL_CONFIG)
 #include <gif_lib.h>
 #endif //IOS ANDROID
 
@@ -567,7 +567,7 @@ private:
 #if (!defined IOS) && (!defined QT_CONFIG)
 	void LoadJPG(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
 	int LoadPNG(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
-#if (!defined ANDROID) && (!defined QT_CONFIG)
+#if (!defined ANDROID) && (!defined QT_CONFIG) && (!defined SDL_CONFIG)
 	void LoadGIF(TextureInfo &textureInfo, const char *filename, int mode = 0, int TextureFormat = TEXTURE_FORMAT);
 	int image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bgcolor, InputFunc readFunc,int mode = 0, int TextureFormat = TEXTURE_FORMAT);
 #endif // (ANDROID) How can we get gif support for android ?
@@ -578,7 +578,7 @@ private:
 #if (!defined PSP)
 	
 	GLuint mCurrentTex;
-#if (defined GL_ES_VERSION_2_0) || (defined GL_VERSION_2_0) || (defined WIN32)
+#if ((defined GL_ES_VERSION_2_0) || (defined GL_VERSION_2_0) || (defined WIN32)) && (!defined CONSOLE_CONFIG)
   // MVP matrix
   ESMatrix  theMvpMatrix;
 
@@ -598,8 +598,6 @@ private:
   GLint     prog2_positionLoc;
   GLint     prog2_texCoordLoc;
   GLint     prog2_colorLoc;
-  // MVP matrix
-  ESMatrix  prog2_mvpMatrix;
   // Uniform locations
   GLint     prog2_mvpLoc;
 
@@ -612,13 +610,11 @@ private:
   int mCurrentTextureFormat;
 #endif
 
+#ifdef PSP
 	bool mVsync;
-
+    int mTexCounter;
+#endif
 	int mSwizzle;
-	int mTexCounter;
-  
-
-
 	int mCurrentTextureFilter;
 
 	int mCurrTexBlendSrc;

JGE/include/JSocket.h

@@ -5,6 +5,8 @@
 #include "Threading.h"
 using namespace std;
 
+#define SERVER_PORT 5001
+
 class JSocket{
 public:
     typedef enum {
@@ -19,10 +21,11 @@ public:
     } SOCKET_STATE;
 
 
-  // Server creation
-  JSocket(string ipAddr);
   // Client creation
+  JSocket(string ipAddr);
+  // Server creation
   JSocket();
+
   ~JSocket();
 
   JSocket* Accept();
@@ -32,6 +35,8 @@ public:
   void Disconnect();
 
 private:
+  // socket state
+  SOCKET_STATE state;
   // socket creation when server accepts a connection
   JSocket(int fd);
   // convert the socket into non-blocking state
@@ -39,11 +44,9 @@ private:
   // socket handle
 #ifdef WIN32
   SOCKET mfd;
-#elif LINUX
+#elif LINUX || PSP
   int mfd;
 #endif
-  // socket state
-  SOCKET_STATE state;
 };
 
 #endif

JGE/include/JSoundSystem.h

@@ -18,34 +18,37 @@
 
 #include "JTypes.h"
 
+
 #ifdef ANDROID
 #include <SLES/OpenSLES.h>
 #include "SLES/OpenSLES_Android.h"
-
-#elif defined USE_PHONON
-    #include <phonon/AudioOutput>
-    #include <phonon/MediaObject>
-#else
-#ifdef WIN32
-    #include <windows.h>
-#define WITH_FMOD
+#elif defined(USE_PHONON)
+#include <phonon/AudioOutput>
+#include <phonon/MediaObject>
+#elif defined (QT_CONFIG)
+#include "QMediaPlayer"
+#include "QMediaPlaylist"
+#include "QSoundEffect"
+#elif defined(WIN32)
+#include <windows.h>
+//#define WITH_FMOD
 #elif defined (PSP)
-    #include <pspgu.h>
-    #include <pspkernel.h>
-    #include <pspdisplay.h>
-    #include <pspdebug.h>
-    #include <pspctrl.h>
-    #include <time.h>
-    #include <string.h>
-    #include <pspaudiolib.h>
-    #include <psprtc.h>
+#include <pspgu.h>
+#include <pspkernel.h>
+#include <pspdisplay.h>
+#include <pspdebug.h>
+#include <pspctrl.h>
+#include <time.h>
+#include <string.h>
+#include <pspaudiolib.h>
+#include <psprtc.h>
 
-    #include "JAudio.h"
-    #include "JMP3.h"
+#include "JAudio.h"
+#include "JMP3.h"
 #endif
+
 #ifdef WITH_FMOD
-    #include "../Dependencies/include/fmod.h"
-#endif
+#include "fmod.h"
 #endif
 
 //------------------------------------------------------------------------------------------------
@@ -68,7 +71,7 @@ public:
 #ifdef USE_PHONON
     Phonon::AudioOutput* mOutput;
     Phonon::MediaObject* mMediaObject;
-    public slots:
+public slots:
     void seekAtTheBegining();
 #elif defined (PSP)
     JMP3* mTrack;
@@ -76,16 +79,26 @@ public:
     std::string filename;
     std::string key;
     std::string ext;
+	void* mTrack;
 #elif defined WITH_FMOD
     FSOUND_SAMPLE* mTrack;		// MP3 needed to be of "sample" type for FMOD, FMUSIC_MODULE is for MODs
+	void* mTrack;
 #elif defined ANDROID
     SLObjectItf playerObject;
     SLPlayItf playInterface;
     SLSeekItf seekInterface;
     SLVolumeItf musicVolumeInterface;
-#else
-    void* mTrack;
-#endif  //WITH_FMOD
+	void* mTrack;
+#elif (defined QT_CONFIG)
+    QMediaPlaylist* playlist;
+    QMediaPlayer* player;
+    string fullpath;
+	void* mTrack;
+#elif (defined WIN32)
+	std::string filename;
+	void* mTrack;
+#endif
+//#endif  //WITH_FMOD
 
 };
 
@@ -93,33 +106,37 @@ public:
 //------------------------------------------------------------------------------------------------    
 class JSample
 {
- public:
+public:
     JSample();
     ~JSample();
 
     unsigned long fileSize();
-
-#if defined (PSP)
-    WAVDATA *mSample;
+#if (defined QT_CONFIG) && (!defined USE_PHONON)
+    QMediaPlayer* effect;
+	void* mSample;
+#elif defined (PSP)
+	WAVDATA* mSample;
 #elif defined (IOS)
     std::string filename;
     std::string key;
     std::string ext;
-    
-    void* mSample;
+	void* mSample;
 #elif defined  (WITH_FMOD)
     FSOUND_SAMPLE *mSample;
 #elif defined (USE_PHONON)
     Phonon::AudioOutput* mOutput;
     Phonon::MediaObject* mMediaObject;
-    void* mSample;
+	void* mSample;
 #elif defined ANDROID
     SLObjectItf playerObject;
     SLPlayItf playInterface;
     SLVolumeItf sampleVolumeInterface;
-    void* mSample;
+	void* mSample;
+#elif (defined WIN32)
+	std::string filename;
+	void* mSample;
 #else
-    void* mSample;
+	void* mSample;
 #endif
 };
 
@@ -134,126 +151,130 @@ class JSoundSystem
 
 public:
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Get the singleton instance
-	///
-	//////////////////////////////////////////////////////////////////////////
-	static JSoundSystem* GetInstance();
+    //////////////////////////////////////////////////////////////////////////
+    /// Get the singleton instance
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    static JSoundSystem* GetInstance();
 
-	static void Destroy();
+    static void Destroy();
 
 
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Load music.
-	///
-	/// @note MP3 is the only supported format for the moment.
-	///
-	/// @param filename - Name of the music file.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	JMusic *LoadMusic(const char *fileName);
+    //////////////////////////////////////////////////////////////////////////
+    /// Load music.
+    ///
+    /// @note MP3 is the only supported format for the moment.
+    ///
+    /// @param filename - Name of the music file.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    JMusic *LoadMusic(const char *fileName);
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Delete music from memory.
-	///
-	/// @param music - Music to be deleted.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	//void FreeMusic(JMusic *music);
+    //////////////////////////////////////////////////////////////////////////
+    /// Delete music from memory.
+    ///
+    /// @param music - Music to be deleted.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    //void FreeMusic(JMusic *music);
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Play music.
-	///
-	/// @param music - Music to be played.
-	/// @param looping - Play the music in a loop.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	void PlayMusic(JMusic *music, bool looping = false);
+    //////////////////////////////////////////////////////////////////////////
+    /// Play music.
+    ///
+    /// @param music - Music to be played.
+    /// @param looping - Play the music in a loop.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    void PlayMusic(JMusic *music, bool looping = false);
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Stop playing.
-	///
-	/// @param music - Music to be stopped.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	void StopMusic(JMusic *music);
+    //////////////////////////////////////////////////////////////////////////
+    /// Stop playing.
+    ///
+    /// @param music - Music to be stopped.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    void StopMusic(JMusic *music);
 
     
-	//////////////////////////////////////////////////////////////////////////
-	/// Resume playing.
-	///
-	/// @param music - Music to be resumed.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	void ResumeMusic(JMusic *music);
+    //////////////////////////////////////////////////////////////////////////
+    /// Resume playing.
+    ///
+    /// @param music - Music to be resumed.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    void ResumeMusic(JMusic *music);
     
-	//////////////////////////////////////////////////////////////////////////
-	/// Pause playing.
-	///
-	/// @param music - Music to be paused.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	void PauseMusic(JMusic *music);
+    //////////////////////////////////////////////////////////////////////////
+    /// Pause playing.
+    ///
+    /// @param music - Music to be paused.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    void PauseMusic(JMusic *music);
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Load sound effect.
-	///
-	/// @note WAV sound effect only.
-	///
-	/// @param fileName - Sound effect for loading.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	JSample *LoadSample(const char *fileName);
+    //////////////////////////////////////////////////////////////////////////
+    /// Load sound effect.
+    ///
+    /// @note WAV sound effect only.
+    ///
+    /// @param fileName - Sound effect for loading.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    JSample *LoadSample(const char *fileName);
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Delete sound effect from memory.
-	///
-	/// @param sample - Sound to be deleted.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	//void FreeSample(JSample *sample);
+    //////////////////////////////////////////////////////////////////////////
+    /// Delete sound effect from memory.
+    ///
+    /// @param sample - Sound to be deleted.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    //void FreeSample(JSample *sample);
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Play sound effect.
-	///
-	/// @param sample - Sound for playing.
-	///
-	//////////////////////////////////////////////////////////////////////////
-	void PlaySample(JSample *sample);
+    //////////////////////////////////////////////////////////////////////////
+    /// Play sound effect.
+    ///
+    /// @param sample - Sound for playing.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    void PlaySample(JSample *sample);
 
-	//////////////////////////////////////////////////////////////////////////
-	/// Set volume for audio playback.
-	///
-	/// @param volume - New volume.
-	///
-	//////////////////////////////////////////////////////////////////////////
-  void SetVolume(int volume);
+    //////////////////////////////////////////////////////////////////////////
+    /// Set volume for audio playback.
+    ///
+    /// @param volume - New volume.
+    ///
+    //////////////////////////////////////////////////////////////////////////
+    void SetVolume(int volume);
 
-	void SetMusicVolume(int volume);
+    void SetMusicVolume(int volume);
 
-  void SetSfxVolume(int volume);
+    void SetSfxVolume(int volume);
 
-  	int mChannel;
+    int mChannel;
 protected:
-	JSoundSystem();
-	~JSoundSystem();
+    JSoundSystem();
+    ~JSoundSystem();
 
-	void InitSoundSystem();
-	void DestroySoundSystem();
+    void InitSoundSystem();
+    void DestroySoundSystem();
 
 private:
-
-	JMusic *mCurrentMusic;
+#if (defined PSP || defined ANDROID)
+    JMusic *mCurrentMusic;
     JSample *mCurrentSample;
+#endif
 
-	int mVolume;
-  int mMusicVolume;
-  int mSampleVolume;
+    int mVolume;
+#ifndef IOS
+    int mMusicVolume;
+#endif
+    int mSampleVolume;
 
 
-	static JSoundSystem* mInstance;
+    static JSoundSystem* mInstance;
 
 };
 
 #endif
+

JGE/include/JSpline.h

@@ -18,12 +18,11 @@ using namespace std;
 
 #define MID_POINT_THRESHOLD			1.0f
 
-
 //////////////////////////////////////////////////////////////////////////
 /// Position of a single dot on screen.
 /// 
 //////////////////////////////////////////////////////////////////////////
-class Point
+class JPoint
 {
 public:
 
@@ -34,13 +33,13 @@ public:
 	/// @param _y - Y position.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	Point(float _x, float _y) { x = _x; y = _y; }
+    JPoint(float _x, float _y) { x = _x; y = _y; }
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Constructor, set position to default (0.0f, 0.0f)
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	Point() { x = 0.0f; y = 0.0f; }
+    JPoint() { x = 0.0f; y = 0.0f; }
 
 	float x;	///< X position.
 	float y;	///< Y position.
@@ -95,7 +94,7 @@ public:
 	/// @param pt - Control point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void AddControlPoint(const Point &pt);
+    void AddControlPoint(const JPoint &pt);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Get a control point of the spline.
@@ -105,7 +104,7 @@ public:
 	/// @return Control point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void GetControlPoint(Point &point, int index);
+    void GetControlPoint(JPoint &point, int index);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Work out all pixels of the spline.
@@ -128,7 +127,7 @@ public:
 	/// @return Position of the desire point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void PointOnCurve(Point &out, float t, const Point &p0, const Point &p1, const Point &p2, const Point &p3);
+    void PointOnCurve(JPoint &out, float t, const JPoint &p0, const JPoint &p1, const JPoint &p2, const JPoint &p3);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Get a number of pixels for this spline.
@@ -146,7 +145,7 @@ public:
 	/// @return Position of the desire point.
 	/// 
 	//////////////////////////////////////////////////////////////////////////
-	void GetPixel(Point &point, int index);
+    void GetPixel(JPoint &point, int index);
 
 	//////////////////////////////////////////////////////////////////////////
 	/// Render the spline to screen.
@@ -156,8 +155,8 @@ public:
 
 private:
 
-	vector<Point> mMidPoints;
-	vector<Point> mPixels;
+    vector<JPoint> mMidPoints;
+    vector<JPoint> mPixels;
 	int mCount;
 
 };

JGE/include/JTypes.h

@@ -26,8 +26,16 @@
 #include "JAudio.h"
 
 #else
-
-#include <stdint.h>
+//#define __STDC_LIMIT_MACROS
+#ifdef IOS
+#include <tr1/cstdint>
+#else
+#include <cstdint>
+#endif
+//#include <stdint.h>
+//the MSC version might only define _MSC_STDINT_H_
+//and that might cause redefinition of standard types
+//#define _STDINT_H_ 
 
 #endif
 
@@ -39,10 +47,10 @@
 #define MAX_CHANNEL		128
 
 enum {
-  JGE_ERR_CANT_OPEN_FILE = -1,
-  JGE_ERR_PNG = -2,  
-  JGE_ERR_MALLOC_FAILED = -4,
-  JGE_ERR_GENERIC = -5,
+    JGE_ERR_CANT_OPEN_FILE = -1,
+    JGE_ERR_PNG = -2,
+    JGE_ERR_MALLOC_FAILED = -4,
+    JGE_ERR_GENERIC = -5,
 };
 
 #ifdef PSP
@@ -75,45 +83,81 @@ enum {
 #define SCREEN_HEIGHT_F			272.0f
 
 
+#ifdef CONSOLE_CONFIG
+#define DEFAULT_BLEND		0
+#define BLEND_OPTION_ADD	0
+#define BLEND_OPTION_BLEND	0
+#define BLEND_ZERO					0
+#define BLEND_ONE					0
+#define BLEND_SRC_COLOR				0
+#define BLEND_ONE_MINUS_SRC_COLOR	0
+#define BLEND_SRC_ALPHA				0
+#define BLEND_ONE_MINUS_SRC_ALPHA	0
+#define BLEND_DST_ALPHA				0
+#define BLEND_ONE_MINUS_DST_ALPHA	0
+#define BLEND_DST_COLOR				0
+#define BLEND_ONE_MINUS_DST_COLOR	0
+#define BLEND_SRC_ALPHA_SATURATE	0
+#define GU_PSM_5551                 0
+#else
 #ifdef WIN32
 //	#define DEFAULT_BLEND		BLEND_DEFAULT
 //	#define BLEND_OPTION_ADD	BLEND_COLORADD
 //	#define BLEND_OPTION_BLEND	(BLEND_COLORADD | BLEND_ALPHABLEND | BLEND_NOZWRITE)
 #else
-	#define DEFAULT_BLEND		GU_TFX_MODULATE
-	#define BLEND_OPTION_ADD	GU_TFX_ADD
-	#define BLEND_OPTION_BLEND	GU_TFX_BLEND
+#define DEFAULT_BLEND		GU_TFX_MODULATE
+#define BLEND_OPTION_ADD	GU_TFX_ADD
+#define BLEND_OPTION_BLEND	GU_TFX_BLEND
 #endif
+#endif // CONSOLE_CONFIG
 
 #if (defined WIN32) && (!defined LINUX)
 	#include <windows.h>
 #endif
-#if defined(LINUX) || defined(IOS) || defined (ANDROID)
-        typedef uint8_t byte;
-        typedef uint32_t DWORD;
-        typedef uint8_t BYTE;
+#if defined(LINUX) && (!defined WIN32) || defined(IOS) || defined (ANDROID)
+typedef uint8_t byte;
+typedef uint32_t DWORD;
+typedef uint8_t BYTE;
 #ifndef IOS
-		typedef bool BOOL;
+typedef bool BOOL;
 #endif
 #endif
 
+typedef int8_t s8;
+typedef int16_t s16;
+typedef int32_t s32;
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+#define PIXEL_TYPE DWORD
+#define ARGB(a, r, g, b)		((PIXEL_TYPE)((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
+#define RGBA(r, g, b, a)		((PIXEL_TYPE)((a) << 24) | ((b) << 16) | ((g) << 8) | (r))
+#ifndef PSP
+#define TEXTURE_FORMAT			0
+#endif  //PSP
 
 
+#ifndef CONSOLE_CONFIG
 #ifndef QT_CONFIG
 #if defined (IOS)
-	#import <OpenGLES/ES2/gl.h>
-	#import <OpenGLES/ES2/glext.h>
-	#import <OpenGLES/ES1/gl.h>
-  #	import <OpenGLES/ES1/glext.h>
+#import <OpenGLES/ES2/gl.h>
+#import <OpenGLES/ES2/glext.h>
+#import <OpenGLES/ES1/gl.h>
+#import <OpenGLES/ES1/glext.h>
 #elif defined (ANDROID)
-  #include <GLES/gl.h>
-  #include <GLES/glext.h>
-#elif defined (WIN32) || defined (LINUX) 
-	#include <GL/gl.h> 
-	#include <GL/glu.h>
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#elif defined (WIN32) || defined (LINUX)
+#if defined(__APPLE__)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+#endif
 #endif
 #else
-# include <QtOpenGL>
+#include <QtOpenGL>
 #endif
 
 #if (defined FORCE_GLES)
@@ -127,152 +171,115 @@ enum {
 #endif
 
 #if defined (PSP)
-
-	#ifndef ABGR8888
-	#define ABGR8888
-	#endif
+#ifndef ABGR8888
+#define ABGR8888
+#endif
 
 
-	#if defined (ABGR8888)
-		#define PIXEL_TYPE				u32
-		#ifndef ARGB
-		#define ARGB(a, r, g, b)		(PIXEL_TYPE)((a << 24) | (b << 16) | (g << 8) | r)	// macro to assemble pixels in correct format
-		#endif
-		#define MAKE_COLOR(a, c)		(a << 24 | c)
-		#define MASK_ALPHA				0xFF000000							// masks for accessing individual pixels
-		#define MASK_BLUE				0x00FF0000
-		#define MASK_GREEN				0x0000FF00
-		#define MASK_RED				0x000000FF
+#if defined (ABGR8888)
+#ifndef ARGB
+#define ARGB(a, r, g, b)		(PIXEL_TYPE)((a << 24) | (b << 16) | (g << 8) | r)	// macro to assemble pixels in correct format
+#endif
+#define MAKE_COLOR(a, c)		(a << 24 | c)
+#define MASK_ALPHA				0xFF000000							// masks for accessing individual pixels
+#define MASK_BLUE				0x00FF0000
+#define MASK_GREEN				0x0000FF00
+#define MASK_RED				0x000000FF
 
-		#define PIXEL_SIZE				4
-		#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_8888
+#define PIXEL_SIZE				4
+#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_8888
 
-		#define	BUFFER_FORMAT			GU_PSM_8888
-		#define TEXTURE_FORMAT			GU_PSM_8888
-		#define TEXTURE_COLOR_FORMAT	GU_COLOR_8888
+#define	BUFFER_FORMAT			GU_PSM_8888
+#define TEXTURE_FORMAT			GU_PSM_8888
+#define TEXTURE_COLOR_FORMAT	GU_COLOR_8888
 
 
-	#elif defined (ABGR5551)
+#elif defined (ABGR5551)
 
-		#ifndef ARGB
-		#define ARGB(a, r, g, b)		((r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10) | ((a >> 7) << 15))
-		#endif
-		#define MAKE_COLOR(a, c)		(((a>>7)<<15) | c)
-		#define MASK_ALPHA				0x8000
-		#define MASK_BLUE				0x7C00
-		#define MASK_GREEN				0x03E0
-		#define MASK_RED				0x001F
-		#define PIXEL_TYPE				u16
-		#define PIXEL_SIZE				2
-		#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_5551
+#ifndef ARGB
+#define ARGB(a, r, g, b)		((r >> 3) | ((g >> 3) << 5) | ((b >> 3) << 10) | ((a >> 7) << 15))
+#endif
+#define MAKE_COLOR(a, c)		(((a>>7)<<15) | c)
+#define MASK_ALPHA				0x8000
+#define MASK_BLUE				0x7C00
+#define MASK_GREEN				0x03E0
+#define MASK_RED				0x001F
+#define PIXEL_TYPE				u16
+#define PIXEL_SIZE				2
+#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_5551
 
-		#define	BUFFER_FORMAT			GU_PSM_8888
-		#define TEXTURE_FORMAT			GU_PSM_5551
-		#define TEXTURE_COLOR_FORMAT	GU_COLOR_5551
+#define	BUFFER_FORMAT			GU_PSM_8888
+#define TEXTURE_FORMAT			GU_PSM_5551
+#define TEXTURE_COLOR_FORMAT	GU_COLOR_5551
 
-	#elif defined (ABGR4444)
-		#ifndef ARGB
-		#define ARGB(a, r, g, b)		((r >> 4) | ((g >> 4) << 4) | ((b >> 4) << 8) | ((a >> 4) << 12))
-		#endif
-		#define MAKE_COLOR(a, c)		(((a>>4)<<12) | c)
-		#define MASK_ALPHA				0xF000
-		#define MASK_BLUE				0x0F00
-		#define MASK_GREEN				0x00F0
-		#define MASK_RED				0x000F
-		#define PIXEL_TYPE				u16
-		#define PIXEL_SIZE				2
-		#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_4444
+#elif defined (ABGR4444)
+#ifndef ARGB
+#define ARGB(a, r, g, b)		((r >> 4) | ((g >> 4) << 4) | ((b >> 4) << 8) | ((a >> 4) << 12))
+#endif
+#define MAKE_COLOR(a, c)		(((a>>4)<<12) | c)
+#define MASK_ALPHA				0xF000
+#define MASK_BLUE				0x0F00
+#define MASK_GREEN				0x00F0
+#define MASK_RED				0x000F
+#define PIXEL_TYPE				u16
+#define PIXEL_SIZE				2
+#define PIXEL_FORMAT			PSP_DISPLAY_PIXEL_FORMAT_4444
 
-		#define	BUFFER_FORMAT			GU_PSM_4444
-		#define TEXTURE_FORMAT			GU_PSM_4444
-		#define TEXTURE_COLOR_FORMAT	GU_COLOR_4444
+#define	BUFFER_FORMAT			GU_PSM_4444
+#define TEXTURE_FORMAT			GU_PSM_4444
+#define TEXTURE_COLOR_FORMAT	GU_COLOR_4444
 
-	#endif
+#endif
 
-	#define	FRAME_BUFFER_WIDTH 		512
-	#define FRAME_BUFFER_SIZE		FRAME_BUFFER_WIDTH*SCREEN_HEIGHT*PIXEL_SIZE
+#define	FRAME_BUFFER_WIDTH 		512
+#define FRAME_BUFFER_SIZE		FRAME_BUFFER_WIDTH*SCREEN_HEIGHT*PIXEL_SIZE
 
-	#define SLICE_SIZE_F			64.0f
-	typedef unsigned int DWORD;
+#define SLICE_SIZE_F			64.0f
+typedef unsigned int DWORD;
 
-	#define BLEND_ZERO					0x1000
-	#define BLEND_ONE					0x1002
-	#define BLEND_SRC_COLOR				GU_SRC_COLOR
-	#define BLEND_ONE_MINUS_SRC_COLOR	GU_ONE_MINUS_SRC_COLOR
-	#define BLEND_SRC_ALPHA				GU_SRC_ALPHA
-	#define BLEND_ONE_MINUS_SRC_ALPHA	GU_ONE_MINUS_SRC_ALPHA
-	#define BLEND_DST_ALPHA				GU_DST_ALPHA
-	#define BLEND_ONE_MINUS_DST_ALPHA	GU_ONE_MINUS_DST_ALPHA
-	#define BLEND_DST_COLOR				GU_DST_COLOR
-	#define BLEND_ONE_MINUS_DST_COLOR	GU_ONE_MINUS_DST_COLOR
-	#define BLEND_SRC_ALPHA_SATURATE	BLEND_ONE
+#define BLEND_ZERO					0x1000
+#define BLEND_ONE					0x1002
+#define BLEND_SRC_COLOR				GU_SRC_COLOR
+#define BLEND_ONE_MINUS_SRC_COLOR	GU_ONE_MINUS_SRC_COLOR
+#define BLEND_SRC_ALPHA				GU_SRC_ALPHA
+#define BLEND_ONE_MINUS_SRC_ALPHA	GU_ONE_MINUS_SRC_ALPHA
+#define BLEND_DST_ALPHA				GU_DST_ALPHA
+#define BLEND_ONE_MINUS_DST_ALPHA	GU_ONE_MINUS_DST_ALPHA
+#define BLEND_DST_COLOR				GU_DST_COLOR
+#define BLEND_ONE_MINUS_DST_COLOR	GU_ONE_MINUS_DST_COLOR
+#define BLEND_SRC_ALPHA_SATURATE	BLEND_ONE
 
-	typedef struct
-	{
-		ScePspFVector2 texture;
-		ScePspFVector3 pos;
-	} PSPVertex3D;
+typedef struct
+{
+    ScePspFVector2 texture;
+    ScePspFVector3 pos;
+} PSPVertex3D;
 
 #else //non PSP
 
-typedef int8_t s8;
-typedef int16_t s16;
-typedef int32_t s32;
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
 
+#define BLEND_ZERO					GL_ZERO
+#define BLEND_ONE					GL_ONE
+#define BLEND_SRC_COLOR				GL_SRC_COLOR
+#define BLEND_ONE_MINUS_SRC_COLOR	GL_ONE_MINUS_SRC_COLOR
+#define BLEND_SRC_ALPHA				GL_SRC_ALPHA
+#define BLEND_ONE_MINUS_SRC_ALPHA	GL_ONE_MINUS_SRC_ALPHA
+#define BLEND_DST_ALPHA				GL_DST_ALPHA
+#define BLEND_ONE_MINUS_DST_ALPHA	GL_ONE_MINUS_DST_ALPHA
+#define BLEND_DST_COLOR				GL_DST_COLOR
+#define BLEND_ONE_MINUS_DST_COLOR	GL_ONE_MINUS_DST_COLOR
+#define BLEND_SRC_ALPHA_SATURATE	GL_SRC_ALPHA_SATURATE
 
-	#define BLEND_ZERO					GL_ZERO
-	#define BLEND_ONE					GL_ONE
-	#define BLEND_SRC_COLOR				GL_SRC_COLOR
-	#define BLEND_ONE_MINUS_SRC_COLOR	GL_ONE_MINUS_SRC_COLOR
-	#define BLEND_SRC_ALPHA				GL_SRC_ALPHA
-	#define BLEND_ONE_MINUS_SRC_ALPHA	GL_ONE_MINUS_SRC_ALPHA
-	#define BLEND_DST_ALPHA				GL_DST_ALPHA
-	#define BLEND_ONE_MINUS_DST_ALPHA	GL_ONE_MINUS_DST_ALPHA
-	#define BLEND_DST_COLOR				GL_DST_COLOR
-	#define BLEND_ONE_MINUS_DST_COLOR	GL_ONE_MINUS_DST_COLOR
-	#define BLEND_SRC_ALPHA_SATURATE	GL_SRC_ALPHA_SATURATE
-
-	#define ARGB(a, r, g, b)		(((a) << 24) | ((r) << 16) | ((g) << 8) | (b))
-	#define RGBA(r, g, b, a)		(((a) << 24) | ((b) << 16) | ((g) << 8) | (r))
-
-  #define TEXTURE_FORMAT			0
   #define GU_PSM_8888 0
   #define GU_PSM_5551 0
   #define GU_PSM_4444 0
   #define GU_PSM_5650 0
-	#define PIXEL_TYPE				DWORD
 
 #endif
-
-
-
-typedef enum Buttons
-  {
-    JGE_BTN_NONE = 0,   // No button pressed
-    JGE_BTN_QUIT,   // Home on PSP
-    JGE_BTN_MENU,   // Start on PSP
-    JGE_BTN_CTRL,   // Select
-    JGE_BTN_POWER,  // Hold
-    JGE_BTN_SOUND,  // Music note
-    JGE_BTN_RIGHT,
-    JGE_BTN_LEFT,
-    JGE_BTN_UP,
-    JGE_BTN_DOWN,
-    JGE_BTN_OK,     // Circle in Japan, Cross in Europe
-    JGE_BTN_CANCEL, // Triangle
-    JGE_BTN_PRI,    // Square (primary)
-    JGE_BTN_SEC,    // Cross or Circle (secondary)
-    JGE_BTN_PREV,   // Left trigger
-    JGE_BTN_NEXT,    // Right trigger
-    JGE_BTN_FULLSCREEN,    // Switch to fullscreen (obviously, PC only)
-
-    JGE_BTN_MAX = JGE_BTN_FULLSCREEN + 1
-  } JButton;
-
-
+#else
+typedef uint32_t GLuint;
+typedef float GLfloat;
+#endif //CONSOLE_CONFIG
 
 //------------------------------------------------------------------------------------------------
 struct Vertex
@@ -357,7 +364,7 @@ public:
 
 	int mFilter;
 
-#if defined (PSP) 	
+#if defined (PSP)
     int mTextureFormat;
 	int mTexId;
 	bool mInVideoRAM;
@@ -542,5 +549,28 @@ public:
 };
 
 
+typedef enum Buttons
+  {
+    JGE_BTN_NONE = 0,   // No button pressed
+    JGE_BTN_QUIT,   // Home on PSP
+    JGE_BTN_MENU,   // Start on PSP
+    JGE_BTN_CTRL,   // Select
+    JGE_BTN_POWER,  // Hold
+    JGE_BTN_SOUND,  // Music note
+    JGE_BTN_RIGHT,
+    JGE_BTN_LEFT,
+    JGE_BTN_UP,
+    JGE_BTN_DOWN,
+    JGE_BTN_OK,     // Circle in Japan, Cross in Europe
+    JGE_BTN_CANCEL, // Triangle
+    JGE_BTN_PRI,    // Square (primary)
+    JGE_BTN_SEC,    // Cross or Circle (secondary)
+    JGE_BTN_PREV,   // Left trigger
+    JGE_BTN_NEXT,    // Right trigger
+    JGE_BTN_FULLSCREEN,    // Switch to fullscreen (obviously, PC only)
+
+    JGE_BTN_MAX = JGE_BTN_FULLSCREEN + 1
+  } JButton;
+
 
 #endif

JGE/include/OutputCapturer.h

@@ -0,0 +1,23 @@
+#ifndef OUTPUTCAPTURER_H
+#define OUTPUTCAPTURER_H
+
+#if defined(QT_CONFIG)
+#include <Qt>
+#include <string>
+#include <sstream>
+#include "Threading.h"
+
+class OutputCapturer
+{
+private:
+    static std::ostringstream stream;
+    static boost::mutex mMutex;
+
+public:
+    static void add(const std::string& s);
+    static void debugAndClear();
+    static void clear();
+};
+#endif
+
+#endif // OUTPUTCAPTURER_H

JGE/include/PrecompiledHeader.h

@@ -0,0 +1,29 @@
+#ifndef PRECOMPILEDHEADER_H
+#define PRECOMPILEDHEADER_H
+
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <list>
+#include <map>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "DebugRoutines.h"
+
+#include <assert.h>
+
+#include "JGE.h"
+#include "JFileSystem.h"
+#include "JLogger.h"
+
+//#ifndef WP8
+//#include <boost/shared_ptr.hpp>
+//#endif
+
+#if defined (WP8) || defined (IOS) || defined (ANDROID) || defined (QT_CONFIG) || defined (SDL_CONFIG)
+#define TOUCH_ENABLED
+#endif
+
+#endif //PRECOMPILEDHEADER_H

JGE/include/Threading.h

@@ -1,7 +1,7 @@
 #ifndef THREADING_H
 #define THREADING_H
 
-#if !defined(PSP) && !defined(QT_CONFIG)
+#if !defined(PSP) && !defined(QT_CONFIG) && !(__cplusplus > 199711L)  && !(_MSC_VER >= 1700)
 #include <boost/date_time.hpp>
 
 #ifdef WIN32
@@ -14,7 +14,7 @@
 #endif
 
 #include <boost/thread/mutex.hpp>
-#elif !defined(QT_CONFIG)
+#elif defined(PSP)
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
 
@@ -26,7 +26,7 @@
 namespace boost
 {
     /**
-    ** PSP specific variant of a boost mutex & scoped_lock 
+    ** PSP specific variant of a boost mutex & scoped_lock
     */
 
     template <class Mutex>
@@ -60,7 +60,7 @@ namespace boost
         {
             sceKernelDeleteSema(mID);
         }
-        
+
         void lock()
         {
             int result = sceKernelWaitSema(mID, 1, 0);
@@ -142,7 +142,7 @@ namespace boost
             }
 
         }
-        
+
         int mID;
         int mThreadID;
         volatile int mRecursionCount;
@@ -164,7 +164,7 @@ namespace boost
 
 
     /**
-    ** Emulating boost::thread configuration glue, with some shortcuts 
+    ** Emulating boost::thread configuration glue, with some shortcuts
     ** This detail namespace is a distillation of boost's thread.hpp, thread_data.hpp.
     */
     namespace detail
@@ -212,13 +212,13 @@ namespace boost
     **
     ** The intent of its usage is this form only:
     ** mWorkerThread = boost::thread(ThreadProc, this);
-	** where ThreadProc is a static member function of the 'this' class,eg:
-	** static void FOO::ThreadProc(void* inParam)
-	** {
-	**		FOO* instance = reinterpret_cast<FOO*>(inParam);
-	**		// now you have class instance data available...
-	** }
-	** 
+    ** where ThreadProc is a static member function of the 'this' class,eg:
+    ** static void FOO::ThreadProc(void* inParam)
+    ** {
+    **		FOO* instance = reinterpret_cast<FOO*>(inParam);
+    **		// now you have class instance data available...
+    ** }
+    **
     ** Any other variant of a thread proc with more than one param is unimplemented.
     */
     class thread
@@ -227,7 +227,7 @@ namespace boost
         ** Helper class for sceKernelStartThread, which passes args by value, not by reference
         ** We use this struct to wrap any pointers that we want to pass to the worker thread.
         */
-        struct CallbackData 
+        struct CallbackData
         {
             CallbackData(detail::thread_data_ptr inThreadInfo)
                 : mThreadInfo(inThreadInfo)
@@ -307,15 +307,12 @@ namespace boost
     }
 }
 
-#elif defined(QT_CONFIG)
+#elif defined(QT_CONFIG) && (__cplusplus <= 199711L)
 
 #include <QMutex>
 #include <QThread>
+#include <QSharedPointer>
 
-#include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
-
-#include "../include/DebugRoutines.h"
 #include "../include/JLogger.h"
 
 namespace boost
@@ -421,23 +418,25 @@ namespace boost
             virtual void run() = 0;
         };
 
-        typedef boost::shared_ptr<detail::thread_data_base> thread_data_ptr;
 
-        template<typename F>
+        typedef QSharedPointer<detail::thread_data_base> thread_data_ptr;
+
+        template<typename F, typename A1>
         class thread_data : public detail::thread_data_base
         {
         public:
-            thread_data(F f_) : f(f_)
+            thread_data(F f_, A1 a1_) : f(f_), a1(a1_)
             {
             }
 
             void run()
             {
-                f();
+                f(a1);
             }
 
         private:
             F f;
+            A1 a1;
 
             void operator=(thread_data&);
             thread_data(thread_data&);
@@ -494,7 +493,7 @@ namespace boost
         }
 
         template <class F,class A1>
-        thread(F f, A1 a1) : mThreadInfo(make_thread_info(boost::bind(boost::type<void>(), f, a1)))
+        thread(F f, A1 a1) : mThreadInfo(make_thread_info(f, a1))
         {
             mpThread = new threadImpl(mThreadInfo);
             LOG("Calling start func");
@@ -511,10 +510,10 @@ namespace boost
         }
 
     private:
-        template<typename F>
-        static inline detail::thread_data_ptr make_thread_info(F f)
+        template<typename F, typename A1>
+        static inline detail::thread_data_ptr make_thread_info(F f, A1 a1)
         {
-            return detail::thread_data_ptr(new detail::thread_data<F>(f));
+            return detail::thread_data_ptr(new detail::thread_data<F, A1>(f, a1));
         }
 
         detail::thread_data_ptr mThreadInfo;
@@ -538,6 +537,80 @@ namespace boost
     }
 }
 
+#elif (__cplusplus > 199711L)  || (_MSC_VER >= 1700)
+
+#include <thread>
+#include <mutex>
+
+namespace boost
+{
+    typedef std::thread thread;
+
+    template <class Mutex>
+    struct unique_lock
+    {
+        unique_lock(Mutex& inMutex) : mMutex(&inMutex)
+        {
+            mMutex->lock();
+        }
+
+        ~unique_lock()
+        {
+            mMutex->unlock();
+        }
+
+        Mutex* mMutex;
+    };
+
+    class mutex
+    {
+    public:
+
+        typedef unique_lock<mutex> scoped_lock;
+
+        mutex()
+          : mQMutex()
+        {
+        }
+
+        ~mutex()
+        {
+        }
+
+        void lock()
+        {
+            mQMutex.lock();
+        }
+
+        void unlock()
+        {
+            mQMutex.unlock();
+        }
+
+        std::mutex mQMutex;
+
+    private:
+        mutex(mutex const&);
+        mutex& operator=(mutex const&);
+    };
+
+    namespace posix_time
+    {
+        typedef unsigned int milliseconds;
+    }
+
+    /**
+    ** boost's platform neutral sleep call.
+    */
+    namespace this_thread
+    {
+        inline void sleep(boost::posix_time::milliseconds const& time)
+        {
+            std::this_thread::sleep_for(std::chrono::milliseconds(time));
+        }
+    }
+}
+
 #endif
 
 #endif // THREADING_H

JGE/include/Vector3D.h

@@ -3,15 +3,6 @@
 
 #include <math.h>
 
-
-/*************************** Macros and constants ***************************/
-// returns a number ranging from -1.0 to 1.0
-#define FRAND   (((float)rand()-(float)rand())/RAND_MAX)
-#define Clamp(x, min, max)  x = (x<min  ? min : x<max ? x : max);
-
-#define SQUARE(x)  (x)*(x)
-
-
 struct Vector3D
 {
   Vector3D(float x, float y, float z) : x(x), y(y), z(z) {}
@@ -63,7 +54,7 @@ struct Vector3D
 
   float Length()
   {
-    float length = (float)sqrt(SQUARE(x) + SQUARE(y) + SQUARE(z));
+    float length = sqrt(x*x + y*y + z*z);
     return (length != 0.0f) ? length : 1.0f;
   }
 

JGE/include/vram.h

@@ -33,6 +33,7 @@ extern "C" {
 #endif
 
 void* vrelptr( void *ptr );		// make a pointer relative to memory base address (ATTENTION: A NULL rel ptr is not illegal/invalid!)
+
 void* vabsptr( void *ptr );		// make a pointer absolute (default return type of valloc)
 
 void* valloc( size_t size );

JGE/src/Downloader.cpp

@@ -0,0 +1,350 @@
+#include "DebugRoutines.h"
+#include "JFileSystem.h"
+#include "Downloader.h"
+
+#define RECORDS_DEFAULT_FILE "cache/records.txt"
+
+#ifdef QT_CONFIG
+QNetworkAccessManager DownloadRequest::networkAccessManager;
+#endif
+#ifdef __EMSCRIPTEN__
+#include "emscripten.h"
+#endif
+
+DownloadRequest::DownloadRequest(string localPath,
+                    string remoteResourceURL,
+                    string ETag,
+                    DownloadStatus downloadStatus,
+                    size_t totalSize,
+                    size_t currentSize):
+    mLocalPath(localPath),
+    mRemoteResourceURL(remoteResourceURL),
+    mRequestedRemoteResourceURL(remoteResourceURL),
+    mETag(ETag),
+    mDownloadStatus(downloadStatus),
+    mUpgradeAvailable(false),
+    mTotalSize(totalSize),
+    mCurrentSize(currentSize)
+{
+}
+
+DownloadRequest::~DownloadRequest()
+{
+}
+
+void DownloadRequest::startHead()
+{
+#ifdef QT_CONFIG
+    QNetworkRequest request(QUrl(QString(mRequestedRemoteResourceURL.c_str())));
+    request.setRawHeader("If-None-Match", mETag.c_str());
+    mNetworkReply = networkAccessManager.head(request);
+    connect(mNetworkReply, SIGNAL(finished()), SLOT(fileDownloaded()));
+#endif
+}
+
+void DownloadRequest::startGet()
+{
+#ifdef QT_CONFIG
+    mNetworkReply = networkAccessManager.get(QNetworkRequest(QUrl(QString(mRequestedRemoteResourceURL.c_str()))));
+#endif
+    mFile.close();
+    JFileSystem::GetInstance()->Remove(getTempLocalPath());
+    JFileSystem::GetInstance()->openForWrite(mFile, getTempLocalPath());
+#ifdef QT_CONFIG
+    connect(mNetworkReply, SIGNAL(downloadProgress(int64_t, int64_t)),
+                SLOT(downloadProgress(int64_t, int64_t)));
+    connect(mNetworkReply, SIGNAL(finished()), SLOT(fileDownloaded()));
+#endif
+
+#ifdef __EMSCRIPTEN__
+     emscripten_async_wget2_data(mRemoteResourceURL.c_str(), "GET", 0, this, 1,
+                                 (em_async_wget2_data_onload_func)DownloadRequest::onLoadCb,
+                                 (em_async_wget2_data_onerror_func)DownloadRequest::onErrorCb,
+                                 (em_async_wget2_data_onprogress_func)DownloadRequest::onProgressCb);
+
+#endif
+}
+
+
+#ifdef __EMSCRIPTEN__
+void DownloadRequest::onLoadCb(unsigned int handle, DownloadRequest* req, const char *buffer, unsigned int size)
+{
+
+    DebugTrace("DownloadRequest::onLoadCb: " << size);
+    req->processBufferDownloaded(size, buffer);
+    Downloader::GetInstance()->Update();
+}
+
+void DownloadRequest::onErrorCb(unsigned int handle, DownloadRequest* req, int errorCode, const char* errorText)
+{
+    DebugTrace("DownloadRequest::onErrorCb");
+    req->processError(errorCode, errorText);
+    Downloader::GetInstance()->Update();
+}
+
+void DownloadRequest::onProgressCb(unsigned int handle, DownloadRequest* req, int bytesReceived, int bytesTotal)
+{
+    DebugTrace("DownloadRequest::onProgressCb");
+    req->DownloadRequest::downloadProgress(bytesReceived, bytesTotal);
+}
+#endif
+
+void DownloadRequest::processError(int errorCode, const char* errorText)
+{
+  DebugTrace(errorText);
+  mDownloadStatus = DownloadRequest::DOWNLOAD_ERROR;
+  mFile.close();
+  JFileSystem::GetInstance()->Remove(getTempLocalPath());
+}
+
+void DownloadRequest::processBufferDownloaded(unsigned int size, const char*buffer)
+{
+  if(mFile.is_open())
+  {
+      mTotalSize = size;
+      mFile.write(buffer, size);
+      mFile.close();
+      if(!JFileSystem::GetInstance()->Rename(getTempLocalPath(), mLocalPath)) {
+          mDownloadStatus = DownloadRequest::DOWNLOAD_ERROR;
+          return;
+      }
+  }
+  mDownloadStatus = DownloadRequest::DOWNLOADED;
+}
+
+void DownloadRequest::fileDownloaded()
+{
+#ifdef QT_CONFIG
+  do {
+        QByteArray eTagByteArray = mNetworkReply->rawHeader("ETag");
+        if(!eTagByteArray.isEmpty()) {
+            string oldETag = mETag;
+            mETag = QString(eTagByteArray).toStdString();
+            if(oldETag!="" && oldETag != mETag)
+                mUpgradeAvailable = true;
+        }
+
+        // let's check some error
+        if(mNetworkReply->error() != QNetworkReply::NoError) {
+            processError((int)mNetworkReply->error(), mNetworkReply->errorString().toStdString().c_str());
+            break;
+        }
+
+        // check if we're getting redirected
+        QVariant redirectionTarget = mNetworkReply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+        if (!redirectionTarget.isNull()) {
+            QUrl newUrl = QUrl(mRequestedRemoteResourceURL.c_str()).resolved(redirectionTarget.toUrl());
+            DebugTrace(string("Redirect to ")+ newUrl.toString().toStdString());
+
+            mRequestedRemoteResourceURL = newUrl.toString().toStdString();
+            mNetworkReply->deleteLater();
+            if(mFile.is_open())
+                startGet();
+            else
+                startHead();
+            return;
+        }
+
+        QByteArray byteArray = mNetworkReply->readAll();
+        processBufferDownloaded(byteArray.size(), byteArray.constData());
+    } while(0);
+
+    Downloader::GetInstance()->Update();
+
+    mNetworkReply->deleteLater();
+    emit statusChanged((int)mDownloadStatus);
+#endif 
+}
+
+void DownloadRequest::downloadProgress(int64_t bytesReceived, int64_t bytesTotal)
+{
+#ifdef QT_CONFIG
+	QByteArray byteArray = mNetworkReply->readAll();
+    mFile.write(byteArray.constData(), byteArray.size());
+#endif
+    mCurrentSize = bytesReceived;
+    mTotalSize = bytesTotal;
+    int percent = 0;
+    if(bytesTotal)
+        percent = (bytesReceived/bytesTotal)*100;
+#ifdef QT_CONFIG
+    emit percentChanged(percent);
+#endif
+}
+
+Downloader* Downloader::mInstance = 0;
+
+Downloader::Downloader(string globalRemoteURL, string localcacheRecords):
+    mGlobalRemoteURL(globalRemoteURL),
+    mLocalCacheRecords(localcacheRecords)
+{
+    JFileSystem::GetInstance()->MakeDir("cache");
+
+    izfstream downloadRecords;
+    if(mLocalCacheRecords.empty())
+        mLocalCacheRecords = RECORDS_DEFAULT_FILE;
+    if(JFileSystem::GetInstance()->openForRead(downloadRecords, mLocalCacheRecords))
+    {// File exists, let's read it.
+        downloadRecords >> (*this);
+    }
+    JFileSystem::GetInstance()->CloseFile();
+}
+
+Downloader::~Downloader()
+{
+    map<string, DownloadRequest*>::iterator ite;
+    for(ite = mRequestMap.begin(); ite != mRequestMap.end(); ite++)
+    {
+        delete (*ite).second;
+    }
+    mRequestMap.erase(mRequestMap.begin(), mRequestMap.end());
+}
+
+Downloader* Downloader::GetInstance()
+{
+    if(!mInstance)
+    {
+        mInstance = new Downloader();
+    }
+    return mInstance;
+}
+
+void Downloader::Release()
+{
+    if(mInstance)
+    {
+        delete mInstance;
+        mInstance = 0;
+    }
+}
+
+bool DownloadRequest::NetworkIsAccessible()
+{
+    bool result = false;
+
+#ifdef QT_CONFIG
+    networkAccessManager.setNetworkAccessible(QNetworkAccessManager::Accessible);
+    result = networkAccessManager.networkAccessible();
+#endif
+
+    return result;
+}
+
+DownloadRequest* Downloader::Get(string localPath, string remoteResourceURL)
+{
+    map<string, DownloadRequest*>::iterator ite = mRequestMap.find(localPath);
+    if(ite == mRequestMap.end())
+    { // request does not exist, let's create it
+        DownloadRequest* request = new DownloadRequest(localPath, remoteResourceURL);
+        std::pair<std::map<string,DownloadRequest*>::iterator,bool> ret;
+        ret = mRequestMap.insert ( std::pair<string,DownloadRequest*>(localPath, request) );
+        if (ret.second==false) {
+            DebugTrace("Downloader::Get Error inserting request in Map");
+            return 0;
+        }
+        ite = ret.first;
+    }
+
+    // Now, we can check the server
+    if((*ite).second->getDownloadStatus() == DownloadRequest::NOT_PRESENT ||
+            (*ite).second->upgradeAvailable())
+    {   // File is not here or an update is available, let's get it
+        (*ite).second->startGet();
+        (*ite).second->mDownloadStatus = DownloadRequest::DOWNLOADING;
+    }
+    else if ((*ite).second->getDownloadStatus() == DownloadRequest::DOWNLOADED)
+    {   // File is here, let's check if there is some update without blocking the playback
+        (*ite).second->startHead();
+    }
+
+    return (*ite).second;
+}
+
+void Downloader::Update()
+{
+    ofstream downloadRecords;
+    if(JFileSystem::GetInstance()->openForWrite(downloadRecords, mLocalCacheRecords))
+    {
+        downloadRecords << (*this);
+    }
+    downloadRecords.close();
+}
+
+ostream& operator<<(ostream& out, const DownloadRequest& d)
+{
+//    HEAD request fails, so this line erase cache record after upgrade check :(
+//    if(d.getDownloadStatus() == DownloadRequest::DOWNLOADED)
+    {
+        out << "localPath=" << d.mLocalPath << endl;
+        out << "remoteResource=" << d.mRemoteResourceURL << endl;
+        out << "ETag=" << d.mETag << endl;
+        out << "upgradeAvailable=" << d.mUpgradeAvailable <<endl;
+    }
+
+    return out;
+}
+
+istream& operator>>(istream& in, DownloadRequest& d)
+{
+    string s;
+
+    while(std::getline(in, s))
+    {
+        size_t limiter = s.find("=");
+        string areaS;
+        if (limiter != string::npos)
+        {
+            areaS = s.substr(0, limiter);
+            if (areaS.compare("localPath") == 0)
+            {
+                d.mLocalPath = s.substr(limiter + 1);
+            }
+            else if (areaS.compare("remoteResource") == 0)
+            {
+                d.mRemoteResourceURL = s.substr(limiter + 1);
+                d.mRequestedRemoteResourceURL = d.mRemoteResourceURL;
+            }
+            else if (areaS.compare("ETag") == 0)
+            {
+                d.mETag = s.substr(limiter + 1);
+                d.mDownloadStatus = DownloadRequest::DOWNLOADED;
+            }
+            else if (areaS.compare("upgradeAvailable") == 0)
+            {
+                d.mUpgradeAvailable = (bool)atoi(s.substr(limiter + 1).c_str());
+                break;
+            }
+        }
+    }
+
+    return in;
+}
+
+ostream& operator<<(ostream& out, const Downloader& d)
+{
+    map<string, DownloadRequest*>::const_iterator ite;
+    for(ite = d.mRequestMap.begin(); ite != d.mRequestMap.end(); ite++)
+    {
+        out << (*(*ite).second) << endl;
+    }
+    return out;
+}
+
+istream& operator>>(istream& in, Downloader& d)
+{
+    while(!in.eof())
+    {
+        DownloadRequest* downloadRequest = new DownloadRequest();
+        in >> (*downloadRequest);
+
+        if(!downloadRequest->getLocalPath().empty() &&
+           !downloadRequest->getRemoteResource().empty() &&
+           !downloadRequest->getETag().empty()) {
+            d.mRequestMap[downloadRequest->getLocalPath()] = downloadRequest;
+        } else {
+            delete downloadRequest;
+        }
+    }
+    return in;
+}
+

JGE/src/JAnimator.cpp

@@ -15,7 +15,7 @@
 #include "../include/JSprite.h"
 #include "../include/JAnimator.h"
 
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@ bool JAnimator::Load(const char* scriptFile)
 		element = script->ToElement();
 		printf("---- Loading %s:%s\n", element->Value(), element->Attribute("name"));
 
-		const char *type[] =
+		string type[] =
 		{
 			"ANIMATION_TYPE_LOOPING",
 			"ANIMATION_TYPE_ONCE_AND_STAY",
@@ -78,7 +78,7 @@ bool JAnimator::Load(const char* scriptFile)
 
 		const char* aniType = element->Attribute("type");
 		for (int i=0;i<5;i++)
-			if (strcmp(type[i], aniType)==0)
+			if (type[i] == aniType)
 			{
 				SetAnimationType(i);
 				break;
@@ -108,7 +108,7 @@ bool JAnimator::Load(const char* scriptFile)
 					element = param->ToElement();
 					if (element != NULL)
 					{
-						if (strcmp(element->Value(), "settings")==0)
+						if (element->ValueStr() == "settings")
 						{
 							const char* quadName = element->Attribute("quad");
 							JQuad* quad = mResource->GetQuad(quadName);

JGE/src/JFileSystem.cpp

@@ -16,9 +16,7 @@ User folder is the only one that is really needed to guarantee both read and wri
 The content that users should not be touching.
 */
 
-#if defined(ANDROID)
-#include "../../include/PrecompiledHeader.h"
-#endif
+#include "dirent.h"
 
 #ifdef WIN32
 #pragma warning(disable : 4786)
@@ -32,7 +30,18 @@ The content that users should not be touching.
 #include "../include/JGE.h"
 #include "../include/JFileSystem.h"
 #include "../include/JLogger.h"
-#include <dirent.h>
+#include "DebugRoutines.h"
+
+
+#ifdef QT_CONFIG
+#include <QDir>
+#endif
+
+/*
+#ifdef IOS
+#include <Foundation/Foundation.h>
+#endif
+*/
 
 JFileSystem* JFileSystem::mInstance = NULL;
 
@@ -115,17 +124,28 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath)
     userPath = [[documentsDirectory  stringByAppendingString: @"/User/"] cStringUsingEncoding:1];
     systemPath = [[documentsDirectory  stringByAppendingString: @"/Res/"] cStringUsingEncoding:1];
 
+#elif defined (__EMSCRIPTEN__)
+    systemPath = "/";
+	DebugTrace("User path " << userPath);
+	DebugTrace("System path " << systemPath);
 #elif defined (ANDROID)
     userPath = JGE::GetInstance()->getFileSystemLocation();
     systemPath = "";
 
 	DebugTrace("User path " << userPath);
 #elif defined (QT_CONFIG)
+
+    QDir sysDir(RESDIR);
     QDir dir(QDir::homePath());
+    dir.mkdir(USERDIR);
     dir.cd(USERDIR);
 
     userPath = QDir::toNativeSeparators(dir.absolutePath()).toStdString();
-    systemPath = "";
+    systemPath = QDir::toNativeSeparators(sysDir.absolutePath()).toStdString();
+
+    DebugTrace("User path " + userPath);
+    DebugTrace("System path " + systemPath);
+    DebugTrace("Current path " + QDir::currentPath().toStdString());
 #else
     //Find the Res.txt file and matching Res folders for backwards compatibility
     ifstream mfile("Res.txt");
@@ -237,7 +257,7 @@ void JFileSystem::clearZipCache()
 
 bool JFileSystem::AttachZipFile(const string &zipfile, char *password /* = NULL */)
 {
-    if (mZipAvailable && mZipFile != NULL)
+    if (mZipAvailable && mZipFile.is_open())
     {
         if (mZipFileName != zipfile)
             DetachZipFile();		// close the previous zip file
@@ -280,6 +300,7 @@ void JFileSystem::DetachZipFile()
 
 bool JFileSystem::openForRead(izfstream & File, const string & FilePath) {
 
+    DebugTrace("JFileSystem::openForRead " << FilePath);
     File.open(FilePath.c_str(), mUserFS);
     if (File)
         return true;
@@ -302,11 +323,15 @@ bool JFileSystem::readIntoString(const string & FilePath, string & target)
 
     int fileSize = GetFileSize(file);
 
+#ifndef __MINGW32__
     try {
+#endif
         target.resize((std::string::size_type) fileSize);
+#ifndef __MINGW32__
     } catch (bad_alloc&) {
         return false;
     }
+#endif
 
 
     if (fileSize)
@@ -320,6 +345,36 @@ bool JFileSystem::openForWrite(ofstream & File, const string & FilePath, ios_bas
 {
     string filename = mUserFSPath;
     filename.append(FilePath);
+
+    #if defined(ANDROID)
+    DebugTrace("ANDROID");
+    std::vector<string> dirs;
+    string path = filename.substr( 0, filename.find_last_of( '/' ) + 1 );
+
+    // put it into list
+    dirs.push_back(path);
+
+    //make list of directories that need to be created
+    do
+    {
+        path = path.substr( 0, path.find_last_of( '/', path.size() - 2 ) + 1 );
+        dirs.push_back(path);
+    
+    } while (path.compare(mUserFSPath) != 0);
+    
+    // remove mUserFSPath from list
+    dirs.pop_back();
+
+    // create missing directories
+    for (std::vector<string>::reverse_iterator it = dirs.rbegin(); it != dirs.rend(); ++it)
+    {
+        if(!DirExists(*it))
+        {
+            MAKEDIR((*it).c_str());
+        }
+    }
+    #endif
+
     File.open(filename.c_str(), mode);
 
     if (File)
@@ -356,7 +411,6 @@ bool JFileSystem::OpenFile(const string &filename)
     mCurrentFileInZip = &(it2->second);
     mFileSize = it2->second.m_Size;
     return true;
-
 }
 
 
@@ -512,7 +566,13 @@ bool JFileSystem::Rename(string _from, string _to)
     string from = mUserFSPath + _from;
     string to = mUserFSPath + _to;
     std::remove(to.c_str());
-    return rename(from.c_str(), to.c_str()) ? true: false;
+    return (rename(from.c_str(), to.c_str()) == 0);
+}
+
+bool JFileSystem::Remove(string aFile)
+{
+    string toRemove = mUserFSPath + aFile;
+    return (std::remove(toRemove.c_str()) == 0);
 }
 
 int JFileSystem::GetFileSize(izfstream & file)

JGE/src/JGE.cpp

@@ -34,7 +34,7 @@
 
 //////////////////////////////////////////////////////////////////////////
 #if defined (WIN32)    // WIN32 specific code
-#include "../../Dependencies/include/fmod.h"
+#include "fmod.h"
 
 u8 JGE::GetAnalogX()
 {
@@ -54,7 +54,7 @@ u8 JGE::GetAnalogY()
 #elif defined (LINUX)    // Unix specific code
 #include <sys/time.h>
 #ifdef WITH_FMOD
-#include "../Dependencies/include/fmod.h"
+#include "fmod.h"
 #endif //WITH_FMOD
 
 
@@ -249,6 +249,7 @@ u32 JGE::BindKey(LocalKeySym sym, JButton button)
 u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
 {
     for (keycodes_it it = keyBinds.begin(); it != keyBinds.end(); )
+    {
         if (sym == it->first && button == it->second)
         {
             keycodes_it er = it;
@@ -256,7 +257,8 @@ u32 JGE::UnbindKey(LocalKeySym sym, JButton button)
             keyBinds.erase(er);
         }
         else ++it;
-        return keyBinds.size();
+    }
+    return keyBinds.size();
 }
 
 u32 JGE::UnbindKey(LocalKeySym sym)
@@ -591,6 +593,8 @@ void JGE::SendCommand(string command)
     sendJNICommand(command);
 #elif defined (IOS)
     SendCommand(command, "");
+#else
+    cerr << command;
 #endif
 }
 
@@ -602,6 +606,8 @@ void JGE::SendCommand(std::string command, std::string parameter)
     [delegate handleWEngineCommand:[NSString stringWithCString: command.c_str() encoding: NSUTF8StringEncoding]
                      withParameter: [NSString stringWithCString: parameter.c_str() encoding:NSUTF8StringEncoding]];
     
+#else
+    cerr << command << " " << parameter;
 #endif
 }
 
@@ -613,6 +619,8 @@ void JGE::SendCommand(std::string command, float& x, float& y, float& width, flo
 #elif IOS
     wagicAppDelegate *delegate = [[UIApplication sharedApplication] delegate];
     [delegate handleWEngineCommand: [NSString stringWithCString: command.c_str() encoding: NSUTF8StringEncoding] withUIParameters: x yCoordinate: y width: width height: height];
+#else
+    cerr << command << " " << x << " " << y << " " << width << " " << height;
 #endif
     
 }
@@ -656,7 +664,6 @@ JNIEnv * JGE::getJNIEnv()
 
 string JGE::getFileSystemLocation()
 {
-    char result[512];
     JNIEnv * env = getJNIEnv();
     if (env == NULL)
     {

JGE/src/JGfx-fake.cpp

@@ -0,0 +1,506 @@
+//-------------------------------------------------------------------------------------
+//
+// JGE++ is a hardware accelerated 2D game SDK for PSP/Windows.
+#include "../../include/JGE.h"
+#include "../../include/JRenderer.h"
+#include "../../include/JResourceManager.h"
+#include "../../include/JFileSystem.h"
+#include "../../include/JAssert.h"
+
+JQuad::JQuad(JTexture *tex, float x, float y, float width, float height)
+    :mTex(tex), mX(x), mY(y), mWidth(width), mHeight(height)
+{
+    JASSERT(tex != NULL);
+    JRenderer::GetInstance()->TransferTextureToGLContext(*tex);
+
+    mHotSpotX = 0.0f;
+    mHotSpotY = 0.0f;
+    //mBlend = BLEND_DEFAULT;
+    for (int i=0;i<4;i++)
+        mColor[i].color = 0xFFFFFFFF;
+
+    mHFlipped = false;
+    mVFlipped = false;
+
+    SetTextureRect(x, y, width, height);
+}
+
+void JQuad::SetTextureRect(float x, float y, float w, float h)
+{
+    mX = x;
+    mY = y;
+    mWidth = w;
+    mHeight = h;
+
+    if(mTex)
+    {
+        mTX0 = x/mTex->mTexWidth;
+        mTY0 = y/mTex->mTexHeight;
+        mTX1 = (x+w)/mTex->mTexWidth;
+        mTY1 = (y+h)/mTex->mTexHeight;
+    }
+}
+
+
+void JQuad::GetTextureRect(float *x, float *y, float *w, float *h)
+{
+    *x=mX; *y=mY; *w=mWidth; *h=mHeight;
+}
+
+
+void JQuad::SetColor(PIXEL_TYPE color)
+{
+    for (int i=0;i<4;i++)
+        mColor[i].color = color;
+}
+
+
+
+void JQuad::SetHotSpot(float x, float y)
+{
+    mHotSpotX = x;
+    mHotSpotY = y;
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+
+JTexture::JTexture() : mWidth(0), mHeight(0), mBuffer(NULL)
+{
+    mTexId = -1;
+}
+
+JTexture::~JTexture()
+{
+    if (mBuffer)
+    {
+        delete [] mBuffer;
+        mBuffer = NULL;
+    }
+}
+
+
+void JTexture::UpdateBits(int x, int y, int width, int height, PIXEL_TYPE* bits)
+{
+    JRenderer::GetInstance()->BindTexture(this);
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+JRenderer* JRenderer::mInstance = NULL;
+bool JRenderer::m3DEnabled = false;
+
+void JRenderer::Set3DFlag(bool flag) { m3DEnabled = flag; }
+
+JRenderer* JRenderer::GetInstance()
+{
+    if (mInstance == NULL)
+    {
+        mInstance = new JRenderer();
+
+        JASSERT(mInstance != NULL);
+
+        mInstance->InitRenderer();
+    }
+
+    return mInstance;
+}
+
+
+void JRenderer::Destroy()
+{
+    if (mInstance)
+    {
+        mInstance->DestroyRenderer();
+        delete mInstance;
+        mInstance = NULL;
+    }
+}
+
+JRenderer::JRenderer() : mActualWidth(SCREEN_WIDTH_F), mActualHeight(SCREEN_HEIGHT_F)
+{
+}
+
+
+JRenderer::~JRenderer()
+{
+
+}
+
+void JRenderer::InitRenderer()
+{
+    mCurrentTextureFilter = TEX_FILTER_NONE;
+    mImageFilter = NULL;
+
+    mCurrTexBlendSrc = BLEND_SRC_ALPHA;
+    mCurrTexBlendDest = BLEND_ONE_MINUS_SRC_ALPHA;
+
+    //	mLineWidth = 1.0f;
+    mCurrentTex = -1;
+    mFOV = 75.0f;
+
+#ifdef USING_MATH_TABLE
+    for (int i=0;i<360;i++)
+    {
+        mSinTable[i] = sinf(i*DEG2RAD);
+        mCosTable[i] = cosf(i*DEG2RAD);
+    }
+#endif
+
+    mCurrentRenderMode = MODE_UNKNOWN;
+}
+
+void JRenderer::DestroyRenderer()
+{
+}
+
+void JRenderer::BeginScene()
+{
+}
+
+void JRenderer::EndScene()
+{
+}
+
+void JRenderer::BindTexture(JTexture *tex)
+{
+}
+
+
+void JRenderer::EnableTextureFilter(bool flag)
+{
+    if (flag)
+        mCurrentTextureFilter = TEX_FILTER_LINEAR;
+    else
+        mCurrentTextureFilter = TEX_FILTER_NEAREST;
+
+    mCurrentTex = -1;
+}
+
+void Swap(float *a, float *b)
+{
+    float n=*a;
+    *a = *b;
+    *b = n;
+}
+
+void JRenderer::RenderQuad(JQuad* quad, float xo, float yo, float angle, float xScale, float yScale)
+{
+    //yo = SCREEN_HEIGHT-yo-1;//-(quad->mHeight);
+    float width = quad->mWidth;
+    float height = quad->mHeight;
+    float x = -quad->mHotSpotX;
+    float y = quad->mHotSpotY;
+
+    Vector2D pt[4];
+    pt[3] = Vector2D(x, y);
+    pt[2] = Vector2D(x+width, y);
+    pt[1] = Vector2D(x+width, y-height);
+    pt[0] = Vector2D(x, y-height);
+
+
+    Vector2D uv[4];
+    uv[0] = Vector2D(quad->mTX0, quad->mTY1);
+    uv[1] = Vector2D(quad->mTX1, quad->mTY1);
+    uv[2] = Vector2D(quad->mTX1, quad->mTY0);
+    uv[3] = Vector2D(quad->mTX0, quad->mTY0);
+
+    if (quad->mHFlipped)
+    {
+        Swap(&uv[0].x, &uv[1].x);
+        Swap(&uv[2].x, &uv[3].x);
+    }
+
+    if (quad->mVFlipped)
+    {
+        Swap(&uv[0].y, &uv[2].y);
+        Swap(&uv[1].y, &uv[3].y);
+    }
+
+    BindTexture(quad->mTex);
+
+    yo = SCREEN_HEIGHT_F - yo;
+}
+
+
+void JRenderer::RenderQuad(JQuad* quad, VertexColor* pt)
+{
+    for (int i=0;i<4;i++)
+    {
+        pt[i].y = SCREEN_HEIGHT_F - pt[i].y;
+        quad->mColor[i].color = pt[i].color;
+    }
+
+    Vector2D uv[4];
+    uv[0] = Vector2D(quad->mTX0, quad->mTY1);
+    uv[1] = Vector2D(quad->mTX1, quad->mTY1);
+    uv[2] = Vector2D(quad->mTX1, quad->mTY0);
+    uv[3] = Vector2D(quad->mTX0, quad->mTY0);
+
+    BindTexture(quad->mTex);
+}
+
+
+void JRenderer::FillRect(float x, float y, float width, float height, PIXEL_TYPE color)
+{
+    y = SCREEN_HEIGHT_F - y - height;
+
+    JColor col;
+    col.color = color;
+}
+
+
+void JRenderer::DrawRect(float x, float y, float width, float height, PIXEL_TYPE color)
+{
+    y = SCREEN_HEIGHT_F - y - height;
+
+    JColor col;
+    col.color = color;
+}
+
+
+void JRenderer::FillRect(float x, float y, float width, float height, PIXEL_TYPE* colors)
+{
+    JColor col[4];
+    for (int i=0;i<4;i++)
+        col[i].color = colors[i];
+
+    FillRect(x, y, width, height, col);
+}
+
+void JRenderer::FillRect(float x, float y, float width, float height, JColor* colors)
+{
+    y = SCREEN_HEIGHT_F - y - height;
+}
+
+
+void JRenderer::DrawLine(float x1, float y1, float x2, float y2, PIXEL_TYPE color)
+{
+    //	glLineWidth (mLineWidth);
+    JColor col;
+    col.color = color;
+}
+
+
+void JRenderer::Plot(float x, float y, PIXEL_TYPE color)
+{
+}
+
+
+void JRenderer::PlotArray(float *x, float *y, int count, PIXEL_TYPE color)
+{
+}
+
+
+
+void JRenderer::ScreenShot(const char* filename __attribute__((unused)))
+{
+
+}
+
+void JRenderer::TransferTextureToGLContext(JTexture& inTexture)
+{
+}
+
+JTexture* JRenderer::CreateTexture(int width, int height, int mode __attribute__((unused)))
+{
+    JTexture *tex = new JTexture();
+    return tex;
+}
+
+JTexture* JRenderer::LoadTexture(const char* filename, int mode, int textureFormat)
+{
+    JTexture *tex = new JTexture();
+    return tex;
+}
+
+
+
+void JRenderer::EnableVSync(bool flag __attribute__((unused)))
+{
+    //	if (flag)
+    //		hge->System_SetState(HGE_FPS, 60);	// HGEFPS_VSYNC
+    //	else
+    //		hge->System_SetState(HGE_FPS, HGEFPS_UNLIMITED);
+}
+
+
+void JRenderer::ClearScreen(PIXEL_TYPE color)
+{
+}
+
+
+void JRenderer::SetTexBlend(int src, int dest)
+{
+}
+
+
+void JRenderer::SetTexBlendSrc(int src)
+{
+}
+
+
+void JRenderer::SetTexBlendDest(int dest)
+{
+}
+
+
+void JRenderer::Enable2D()
+{
+}
+
+
+void JRenderer::Enable3D()
+{ /* NOT USED
+  if (!m3DEnabled)
+  return;
+
+  if (mCurrentRenderMode == MODE_3D)
+  return;
+
+  mCurrentRenderMode = MODE_3D;
+
+  glViewport (0, 0, (GLsizei)SCREEN_WIDTH, (GLsizei)SCREEN_HEIGHT);		// Reset The Current Viewport
+  glMatrixMode (GL_PROJECTION);												// Select The Projection Matrix
+  glLoadIdentity ();															// Reset The Projection Matrix
+  gluPerspective (mFOV, (GLfloat)SCREEN_WIDTH/(GLfloat)SCREEN_HEIGHT,	// Calculate The Aspect Ratio Of The Window
+  0.5f, 1000.0f);
+  glMatrixMode (GL_MODELVIEW);										// Select The Modelview Matrix
+  glLoadIdentity ();													// Reset The Modelview Matrix
+
+  glEnable (GL_DEPTH_TEST); */
+}
+
+
+void JRenderer::SetClip(int, int, int, int)
+{// NOT USED
+    //glScissor(x, y, width, height);
+}
+
+
+void JRenderer::LoadIdentity()
+{// NOT USED
+    //glLoadIdentity();
+}
+
+
+void JRenderer::Translate(float, float, float)
+{// NOT USED
+    //glTranslatef(x, y, z);
+}
+
+
+void JRenderer::RotateX(float)
+{// NOT USED
+    //glRotatef(angle*RAD2DEG, 1.0f, 0.0f, 0.0f);
+}
+
+
+void JRenderer::RotateY(float)
+{// NOT USED
+    //glRotatef(angle*RAD2DEG, 0.0f, 1.0f, 0.0f);
+}
+
+
+void JRenderer::RotateZ(float)
+{// NOT USED
+    //glRotatef(angle*RAD2DEG, 0.0f, 0.0f, 1.0f);
+}
+
+
+void JRenderer::PushMatrix()
+{// NOT USED
+    //glPushMatrix();
+}
+
+
+void JRenderer::PopMatrix()
+{// NOT USED
+    //glPopMatrix();
+}
+
+void JRenderer::RenderTriangles(JTexture* texture, Vertex3D *vertices, int start, int count)
+{
+}
+
+
+void JRenderer::SetFOV(float fov)
+{
+    mFOV = fov;
+}
+
+
+void JRenderer::FillPolygon(float* x, float* y, int count, PIXEL_TYPE color)
+{
+}
+
+
+void JRenderer::DrawPolygon(float* x, float* y, int count, PIXEL_TYPE color)
+{
+}
+
+
+void JRenderer::DrawLine(float x1, float y1, float x2, float y2, float lineWidth, PIXEL_TYPE color)
+{
+    float dy=y2-y1;
+    float dx=x2-x1;
+    if(dy==0 && dx==0)
+        return;
+
+    float l=(float)hypot(dx,dy);
+
+    float x[4];
+    float y[4];
+
+    x[0]=x1+lineWidth*(y2-y1)/l;
+    y[0]=y1-lineWidth*(x2-x1)/l;
+
+    x[1]=x1-lineWidth*(y2-y1)/l;
+    y[1]=y1+lineWidth*(x2-x1)/l;
+
+    x[2]=x2-lineWidth*(y2-y1)/l;
+    y[2]=y2+lineWidth*(x2-x1)/l;
+
+    x[3]=x2+lineWidth*(y2-y1)/l;
+    y[3]=y2-lineWidth*(x2-x1)/l;
+
+    FillPolygon(x, y, 4, color);
+}
+
+
+void JRenderer::DrawCircle(float x, float y, float radius, PIXEL_TYPE color)
+{
+}
+
+void JRenderer::FillCircle(float x, float y, float radius, PIXEL_TYPE color)
+{
+}
+
+
+void JRenderer::DrawPolygon(float x, float y, float size, int count, float startingAngle, PIXEL_TYPE color)
+{
+}
+
+
+void JRenderer::FillPolygon(float x, float y, float size, int count, float startingAngle, PIXEL_TYPE color)
+{
+}
+
+
+void JRenderer::SetImageFilter(JImageFilter* imageFilter)
+{
+    mImageFilter = imageFilter;
+}
+
+
+
+void JRenderer::DrawRoundRect(float x, float y, float w, float h, float radius, PIXEL_TYPE color)
+{
+}
+
+
+
+void JRenderer::FillRoundRect(float x, float y, float w, float h, float radius, PIXEL_TYPE color)
+{
+}
+

JGE/src/JLBFont.cpp

@@ -49,12 +49,13 @@ JLBFont::JLBFont(const char *fontname, int lineheight, bool useVideoRAM)
 
     sprintf(filename, "%s.png", fontname);
     mTexture = mRenderer->LoadTexture(filename, useVideoRAM);
+	mTextureScale = (float) lineheight/ (mTexture->mHeight/16);
 
-    if (mTexture == NULL) return;
+	if (mTexture == NULL) return;
 
     mHeight = (float) lineheight;
 
-    mQuad = new JQuad(mTexture, 0.0f, 0.0f, 16.0f, mHeight);
+    mQuad = new JQuad(mTexture, 0.0f, 0.0f, 16.0f/mTextureScale, mHeight/mTextureScale);
 
     float a, b, c;
 
@@ -158,7 +159,7 @@ void JLBFont::DrawString(const char *string, float x, float y, int align, float
 
         index = (*p - 32)+mBase;
 
-        float charWidth = mCharWidth[index];
+        float charWidth = mCharWidth[index]*mTextureScale;
         float delta = (charWidth + mTracking) * mScale;
         float xPos =  mXPos[index];
         if (leftOffset)
@@ -194,8 +195,8 @@ void JLBFont::DrawString(const char *string, float x, float y, int align, float
                 charWidth = (delta/mScale) - mTracking;
             }
         }
-        mQuad->SetTextureRect(xPos, mYPos[index], charWidth , mHeight);
-        mRenderer->RenderQuad(mQuad, dx, dy, mRotation, mScale, mScale);
+        mQuad->SetTextureRect(xPos, mYPos[index], charWidth/mTextureScale, mHeight/mTextureScale);
+        mRenderer->RenderQuad(mQuad, dx, dy, mRotation, mScale*mTextureScale, mScale*mTextureScale);
         dx += delta;
         p++;
     }
@@ -235,7 +236,7 @@ float JLBFont::GetStringWidth(const char *string) const
         ch = *p - 32;
         p++;
         if (ch < 0) continue;
-        len += mCharWidth[ch+mBase] + mTracking;
+        len += (mCharWidth[ch+mBase]*mTextureScale) + mTracking;
     }
     len -= mTracking;
     return len*mScale;

JGE/src/JMD2Model.cpp

@@ -257,6 +257,8 @@ void JMD2Model::CalculateNormal(float *p1, float *p2, float *p3)
 #else
    // FIXME
 #endif
+#else
+    cerr << p1 << " " << p2 << " " << p3 << endl;
 #endif
 }
 

JGE/src/JMP3.cpp

@@ -10,6 +10,7 @@
 #include <pspaudio.h>
 #include <pspmp3.h>
 #include <psputility.h>
+#include <unistd.h>
 
 #else
 #define PSP_AUDIO_VOLUME_MAX 100

JGE/src/JNetwork.cpp

@@ -33,15 +33,43 @@
 #include <sstream>
 #include "../include/JSocket.h"
 
-map<string, processCmd> JNetwork::sCommandMap;
+map<string, JNetwork::CommandStruc> JNetwork::sCommandMap;
 
 bool JNetwork::isConnected(){
-  if (connected_to_ap !=1) return false;
+  if (connected_to_ap !=1 || !socket) return false;
   return socket->isConnected();
 }
 
+void JNetwork::getServerIp(string& aString)
+{
+#ifdef WIN32
+    char ac[80];
+    if (gethostname(ac, sizeof(ac)) == SOCKET_ERROR) {
+        DebugTrace("Error " << WSAGetLastError() <<
+                " when getting local host name.\n");
+		return;
+    }
+    DebugTrace( "Host name is " << ac << ".\n");
+
+    struct hostent *phe = gethostbyname(ac);
+    if (phe == 0) {
+        DebugTrace("Yow! Bad host lookup.\n");
+		return;
+    }
+
+    for (int i = 0; phe->h_addr_list[i] != 0; ++i) {
+        struct in_addr addr;
+        memcpy(&addr, phe->h_addr_list[i], sizeof(struct in_addr));
+        aString = inet_ntoa(addr);
+    }
+#else
+    aString = "No clue";
+#endif
+}
+
+
 JNetwork::JNetwork()
-  : mpWorkerThread(NULL)
+  : mpWorkerThread(NULL), socket(0)
 {
 #if (defined WIN32) || (defined LINUX)
   connected_to_ap = 1;
@@ -62,30 +90,68 @@ JNetwork::~JNetwork()
     delete socket;
 }
 
-bool JNetwork::sendCommand(string xString)
+bool JNetwork::sendCommand(const string& xString, const string& payload, const string& suffix)
 {
-  string aString = xString;
+  string aString;
   boost::mutex::scoped_lock l(sendMutex);
   if(!socket) {
-    DebugTrace("sendCommand failed: no sockeet");
+    DebugTrace("sendCommand failed: no socket");
     return false;
   }
-  aString = aString + "Command";
+  aString = xString + suffix;
   if(sCommandMap.find(aString) == sCommandMap.end()) {
     DebugTrace("sendCommand failed: command not registered");
     return false;
   }
-  aString = aString + "\n";
+  aString = "<" + aString + ">" + "\n" + payload + "\n" + "<" + aString + "/>";
 
   toSend << aString;
 
   return true;
 }
 
-void JNetwork::registerCommand(string command, processCmd processCommand, processCmd processResponse)
+void JNetwork::registerCommand(string command, void* object, processCmd processCommand, processCmd processResponse)
 {
-  sCommandMap[command + "Command"] = processCommand;
-  sCommandMap[command + "Response"] = processResponse;
+	CommandStruc struc;
+	struc.object = object;
+	struc.command = command;
+	struc.processCommand = processCommand;
+
+	sCommandMap[command + "Request"] = struc;
+	struc.processCommand = processResponse;
+	sCommandMap[command + "Response"] = struc;
+}
+
+void JNetwork::Update()
+{
+	boost::mutex::scoped_lock r(receiveMutex);
+    // Checking for some command to execute
+	size_t begin_start_tag = received.str().find("<");
+	size_t end_start_tag = received.str().find(">");
+	string command = received.str().substr(begin_start_tag+1, end_start_tag-(begin_start_tag+1));
+	size_t begin_end_tag = received.str().find(command + "/>");
+	size_t end_end_tag = received.str().find("/>");
+    if(begin_start_tag != string::npos && begin_end_tag != string::npos )
+    {
+		map<string, CommandStruc>::iterator ite = sCommandMap.find(command);
+		if(ite != sCommandMap.end())
+		{
+			DebugTrace("begin of command received : " + received.str() );
+			DebugTrace("begin of command toSend : " + toSend.str() );
+
+			processCmd theMethod = (ite)->second.processCommand;
+			stringstream input(received.str().substr(end_start_tag+1, (begin_end_tag-1)-(end_start_tag+1)));
+			stringstream output;
+			theMethod((ite)->second.object, input, output);
+			string aString = received.str().substr(end_end_tag+2, string::npos);
+			received.str(aString);
+			if(output.str().size())
+				sendCommand((ite)->second.command, output.str(), "Response");
+
+			DebugTrace("end of command received : "<< received.str() );
+			DebugTrace("end of command toSend : "<< toSend.str() );
+		}
+    }
 }
 
 void JNetwork::ThreadProc(void* param)
@@ -105,71 +171,33 @@ void JNetwork::ThreadProc(void* param)
   }
 
   while(pSocket && pSocket->isConnected()) {
-    char buff[1024];
+    char buff[4096];
     {
-      boost::mutex::scoped_lock l(pThis->receiveMutex);
       int len =  pSocket->Read(buff, sizeof(buff));
-      if(len) {
+      if(len > 0) {
+		boost::mutex::scoped_lock l(pThis->receiveMutex);
         DebugTrace("receiving " << len << " bytes : " << buff);
-        pThis->received << buff;
-      }
-      // Checking for some command to execute
-      size_t found = pThis->received.str().find("Command");
-      if(found != string::npos)
-      {
-        map<string, processCmd>::iterator ite = sCommandMap.find((pThis->received.str()).substr(0, found) + "Command");
-        if(ite != sCommandMap.end())
-        {
-          DebugTrace("begin of command received : "<< pThis->received.str() );
-          DebugTrace("begin of command toSend : "<< pThis->toSend.str() );
-
-          boost::mutex::scoped_lock l(pThis->sendMutex);
-          pThis->toSend << pThis->received.str().substr(0, found) + "Response ";
-          pThis->received.str("");
-          processCmd theMethod = (ite)->second;
-          theMethod(pThis->received, pThis->toSend);
-
-          DebugTrace("end of command received : "<< pThis->received.str() );
-          DebugTrace("end of command toSend : "<< pThis->toSend.str() );
-        }
-      }
-      // Checking for some response to execute
-      found = pThis->received.str().find("Response");
-      if(found != string::npos)
-      {
-        map<string, processCmd>::iterator ite = sCommandMap.find((pThis->received.str()).substr(0, found) + "Response");
-        if(ite != sCommandMap.end())
-        {
-          DebugTrace("begin of response received : "<< pThis->received.str() );
-          DebugTrace("begin of response toSend : "<< pThis->toSend.str() );
-
-          boost::mutex::scoped_lock l(pThis->sendMutex);
-          string aString;
-          pThis->received >> aString;
-          processCmd theMethod = (ite)->second;
-          theMethod(pThis->received, pThis->toSend);
-          pThis->received.str("");
-
-          DebugTrace("end of response received : "<< pThis->received.str() );
-          DebugTrace("end of response toSend : "<< pThis->toSend.str() );
-        }
+        pThis->received.str(pThis->received.str() + buff);
+        DebugTrace("received " << pThis->received.str().size() << " bytes : " << pThis->received.str());
       }
     }
-
-    boost::mutex::scoped_lock l(pThis->sendMutex);
-    if(!pThis->toSend.str().empty())
-    {
-      DebugTrace("sending  " << pThis->toSend.str().size() << " bytes : " << pThis->toSend.str());
-      pSocket->Write((char*)pThis->toSend.str().c_str(), pThis->toSend.str().size()+1);
-      pThis->toSend.str("");
-    }
+	{
+		boost::mutex::scoped_lock l(pThis->sendMutex);
+		if(!pThis->toSend.str().empty())
+		{
+		  DebugTrace("sending  " << pThis->toSend.str().size() << " bytes : " << pThis->toSend.str());
+		  pSocket->Write((char*)pThis->toSend.str().c_str(), pThis->toSend.str().size()+1);
+		  pThis->toSend.str("");
+		}
+	}
+    boost::this_thread::sleep(boost::posix_time::milliseconds(1));
   }
 
   DebugTrace("Quitting Thread");
 }
 
 #if defined (WIN32) || defined (LINUX)
-int JNetwork::connect(string ip)
+int JNetwork::connect(const string& ip)
 {
   if (mpWorkerThread) return 0;
   serverIP = ip;
@@ -179,7 +207,7 @@ int JNetwork::connect(string ip)
 
 #else
 
-int JNetwork::connect(string serverIP){
+int JNetwork::connect(const string& serverIP){
 #ifdef NETWORK_SUPPORT
   int err;
   char buffer[4096];

JGE/src/JOBJModel.cpp

@@ -75,10 +75,10 @@ bool JOBJModel::Load(const char *modelName, const char *textureName)
 	
 	int count;
 
-    while (filePtr < size)
-    {
+	while (filePtr < size)
+	{
 		filePtr = ReadLine(tmpLine, buffer, filePtr, size);
-        {
+		{
 
 			if ((tmpLine[0] == '#') || (strlen(tmpLine)  < 3))
 			{
@@ -89,19 +89,19 @@ bool JOBJModel::Load(const char *modelName, const char *textureName)
 
 				if (count == 4)
 				{
-					if (strcmp(s1, "vn") == 0)
+					if (string("vn") == s1)
 						normalList.push_back(vert);
-					else if (strcmp(s1, "vt") == 0)
+					else if (string("vt") == s1)
 						texList.push_back(vert);
-					else if (strcmp(s1, "v") == 0)
+					else if (string("v") == s1)
 						vertList.push_back(vert);
 				}
 				else if (count == 3)
 				{
-					if (strcmp(s1, "vt") == 0)
+					if (string("vt") == s1)
 						texList.push_back(vert);
 				}
-	             
+				 
 			}
 			else if (tmpLine[0] == 'f')
 			{
@@ -211,7 +211,7 @@ bool JOBJModel::Load(const char *modelName, const char *textureName)
 	if (textureName != NULL)
 		mTexture = JRenderer::GetInstance()->LoadTexture(textureName);
 
-    return true;
+	return true;
 
 }
 

JGE/src/JParticleEffect.cpp

@@ -19,7 +19,7 @@
 #include "../include/JFileSystem.h"
 #include "../include/JResourceManager.h"
 
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
 
 //-------------------------------------------------------------------------------------
 
@@ -90,7 +90,7 @@ bool JParticleEffect::Load(const char* filename)
 // 		FIELD_COUNT
 // 	};
 
-	const char* lifeValues[] =
+	const string lifeValues[] =
 	{
 		"speed",
 		"size",
@@ -104,7 +104,7 @@ bool JParticleEffect::Load(const char* filename)
 		"gravity"
 	};
 
-	const char* typeNames[] =
+	const string typeNames[] =
 	{
 		"POINT",
 		"AREA",
@@ -113,7 +113,7 @@ bool JParticleEffect::Load(const char* filename)
 		"CIRCLE"
 	};
 
-	const char* modeNames[] =
+	const string modeNames[] =
 	{
 		"REPEAT",
 		"ONCE",
@@ -149,32 +149,32 @@ bool JParticleEffect::Load(const char* filename)
 			{
 				element = param->ToElement();
 				
-				if (strcmp(element->Attribute("name"), "settings")==0)
+				if (string("settings") == element->Attribute("name"))
 				{
 					
-					if (strcmp(element->Attribute("blend"), "NORMAL")==0)
+					if (string("NORMAL") == element->Attribute("blend"))
 						mParticleEmitters[mEmitterCount]->SetBlending(BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA);
-					else if (strcmp(element->Attribute("blend"), "ADDITIVE")==0)
+					else if (string("ADDITIVE") == element->Attribute("blend"))
 						mParticleEmitters[mEmitterCount]->SetBlending(BLEND_SRC_ALPHA, BLEND_ONE);
 					
 					for (unsigned int i=0;i<sizeof(modeNames)/sizeof(char*);i++)
 					{
-						if (strcmp(element->Attribute("mode"), modeNames[i])==0)
+						if (modeNames[i] == element->Attribute("mode"))
 						{
 							mParticleEmitters[mEmitterCount]->mEmitterMode = i;
 							#if defined (_DEBUG)
-								printf("emitter mode:%s\n", modeNames[i]);
+								printf("emitter mode:%s\n", modeNames[i].c_str());
 							#endif
 							break;
 						}
 					}
 					for (unsigned i=0;i<sizeof(typeNames)/sizeof(char*);i++)
 					{
-						if (strcmp(element->Attribute("type"), typeNames[i])==0)
+						if (typeNames[i] == element->Attribute("type"))
 						{
 							mParticleEmitters[mEmitterCount]->mType = i;
 							#if defined (_DEBUG)
-								printf("emitter type:%s\n", typeNames[i]);
+								printf("emitter type:%s\n", typeNames[i].c_str());
 							#endif
 							break;
 						}
@@ -213,7 +213,7 @@ bool JParticleEffect::Load(const char* filename)
 
 					}
 				}
-				else if (strcmp(element->Attribute("name"), "quantity")==0)
+				else if (string("quantity") == element->Attribute("name"))
 				{
 					for (key = param->FirstChild(); key; key = key->NextSibling())
 					{
@@ -227,7 +227,7 @@ bool JParticleEffect::Load(const char* filename)
 						
 					}
 				}
-				else if (strcmp(element->Attribute("name"), "lifex")==0)
+				else if (string("lifex") == element->Attribute("name"))
 				{
 					if (element->QueryFloatAttribute("base", &baseValue) == TIXML_SUCCESS &&
 						element->QueryFloatAttribute("max", &value) == TIXML_SUCCESS)
@@ -236,7 +236,7 @@ bool JParticleEffect::Load(const char* filename)
 						mParticleEmitters[mEmitterCount]->mLifeMax= value;	
 					}
 				}
-				else if (strcmp(element->Attribute("name"), "anglex")==0)
+				else if (string("anglex") == element->Attribute("name"))
 				{
 					if (element->QueryFloatAttribute("base", &baseValue) == TIXML_SUCCESS &&
 						element->QueryFloatAttribute("max", &value) == TIXML_SUCCESS)
@@ -245,7 +245,7 @@ bool JParticleEffect::Load(const char* filename)
 						mParticleEmitters[mEmitterCount]->mAngleMax= value*DEG2RAD;	
 					}
 				}
-				else if (strcmp(element->Attribute("name"), "speedx")==0)
+				else if (string("speedx") == element->Attribute("name"))
 				{
 					if (element->QueryFloatAttribute("base", &baseValue) == TIXML_SUCCESS &&
 						element->QueryFloatAttribute("max", &value) == TIXML_SUCCESS)
@@ -254,7 +254,7 @@ bool JParticleEffect::Load(const char* filename)
 						mParticleEmitters[mEmitterCount]->mSpeedMax= value;	
 					}
 				}
-				else if (strcmp(element->Attribute("name"), "sizex")==0)
+				else if (string("sizex") == element->Attribute("name"))
 				{
 					if (element->QueryFloatAttribute("base", &baseValue) == TIXML_SUCCESS &&
 						element->QueryFloatAttribute("max", &value) == TIXML_SUCCESS)
@@ -267,7 +267,7 @@ bool JParticleEffect::Load(const char* filename)
 				{
 					for (int i=0;i<FIELD_COUNT;i++)
 					{
-						if (strcmp(element->Attribute("name"), lifeValues[i])==0)
+						if (lifeValues[i] == element->Attribute("name"))
 						{
 							for (key = param->FirstChild(); key; key = key->NextSibling())
 							{

JGE/src/JResourceManager.cpp

@@ -14,9 +14,9 @@
 #include "../include/JResourceManager.h"
 #include "../include/JFileSystem.h"
 #include "../include/JLBFont.h"
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
 
-#if defined (_DEBUG) && defined (WIN32)
+#if defined (_DEBUG) && defined (WIN32) && (!defined LINUX)
 #include "crtdbg.h"
 #define NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #else
@@ -119,11 +119,11 @@ bool JResourceManager::LoadResource(const string& resourceName)
 			element = node->ToElement();
 			if (element != NULL)
 			{
-				if (strcmp(element->Value(), "texture")==0)
+				if (element->ValueStr() == "texture")
 				{
 					CreateTexture(element->Attribute("name"));
 				}
-				else if (strcmp(element->Value(), "quad")==0)
+				else if (element->ValueStr() == "quad")
 				{
 					string quadName = element->Attribute("name");
 					string textureName = element->Attribute("texture");
@@ -170,7 +170,7 @@ bool JResourceManager::LoadResource(const string& resourceName)
 						GetQuad(id)->SetHotSpot(hotspotX, hotspotY);
 					}
 				}
-				else if (strcmp(element->Value(), "font")==0)
+				else if (element->ValueStr() == "font")
 				{
 				}
 

JGE/src/JSocket.cpp

@@ -1,4 +1,3 @@
-#if 0
 // need a complete rewrite to comply to the new interface
 #ifdef NETWORK_SUPPORT
 
@@ -21,23 +20,21 @@
 #endif
 
 #include "../include/JGE.h"
-
 #include "../include/JSocket.h"
-JSocket * JSocket::mInstance = NULL;
 
-#define SERVER_PORT 20666
-
-int JSocket::connected = 0;
-
-void JSocket::init(){
+JSocket::JSocket(){
 #ifdef NETWORK_SUPPORT
 	sceUtilityLoadNetModule(1);
 	sceUtilityLoadNetModule(3);
 #endif
 }
 
-JSocket::JSocket(){
-  init();
+JSocket::JSocket(string ipAddr)
+{
+}
+
+JSocket::JSocket(int fd)
+{
 }
 
 JSocket::~JSocket(){
@@ -48,7 +45,27 @@ JSocket::~JSocket(){
 #endif        
 }
 
+void JSocket::Disconnect()
+{
+}
 
+JSocket* JSocket::Accept()
+{
+	return 0;
+}
+
+int JSocket::Read(char* buff, int size)
+{
+	return 0;
+}
+
+int JSocket::Write(char* buff, int size)
+{
+	return 0;
+}
+
+
+#if 0
 int JSocket::make_socket(uint16_t port)
 {
 	int sock = -1;

JGE/src/JSpline.cpp

@@ -13,7 +13,7 @@
 #include "../include/JFileSystem.h"
 #include "../include/JSpline.h"
 
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
 
 #define SMALL_NUMBER		0.0001f
 
@@ -71,7 +71,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale)
 		element->QueryFloatAttribute("x", &xx);
 		element->QueryFloatAttribute("y", &yy);
 
-		Point pt(xx*xscale, yy*yscale);
+        JPoint pt(xx*xscale, yy*yscale);
 		AddControlPoint(pt);
 		
 	}
@@ -84,7 +84,7 @@ bool JSpline::Load(const char *filename, float xscale, float yscale)
 
 
 
-void JSpline::PointOnCurve(Point &out, float t, const Point &p0, const Point &p1, const Point &p2, const Point &p3)
+void JSpline::PointOnCurve(JPoint &out, float t, const JPoint &p0, const JPoint &p1, const JPoint &p2, const JPoint &p3)
 {
 	float t2 = t * t;
 	float t3 = t2 * t;
@@ -113,8 +113,8 @@ void JSpline::GeneratePixels()
 	x = mMidPoints[1].x;
 	y = mMidPoints[1].y;
 
-	Point newPt(x, y);
-	Point extraPt;
+    JPoint newPt(x, y);
+    JPoint extraPt;
 
 	mPixels.push_back(newPt);
 
@@ -151,13 +151,13 @@ void JSpline::GeneratePixels()
 }
 
 
-void JSpline::AddControlPoint(const Point &pt)
+void JSpline::AddControlPoint(const JPoint &pt)
 {
 	mMidPoints.push_back(pt);
 }
 
 
-void JSpline::GetControlPoint(Point &point, int index)
+void JSpline::GetControlPoint(JPoint &point, int index)
 {
 	if (index < (int)mMidPoints.size())
 	{
@@ -167,7 +167,7 @@ void JSpline::GetControlPoint(Point &point, int index)
 }
 
 
-void JSpline::GetPixel(Point &point, int index)
+void JSpline::GetPixel(JPoint &point, int index)
 {
 	if (index < (int)mPixels.size())
 	{

JGE/src/OutputCapturer.cpp

@@ -0,0 +1,22 @@
+#include "../include/OutputCapturer.h"
+
+std::ostringstream OutputCapturer::stream;
+boost::mutex OutputCapturer::mMutex;
+
+void OutputCapturer::add(const std::string& s)
+{
+    boost::mutex::scoped_lock lock(mMutex);
+    stream << s << "\n";
+}
+
+void OutputCapturer::debugAndClear()
+{
+    stream.flush();
+    qDebug("%s", stream.str().c_str());
+    stream.str("");
+}
+
+void OutputCapturer::clear()
+{
+    stream.str("");
+}

JGE/src/android/JSfx.cpp

@@ -10,6 +10,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <string.h>
 
 //////////////////////////////////////////////////////////////////////////
 
@@ -158,46 +159,53 @@ JMusic *JSoundSystem::LoadMusic(const char *fileName)
     {
         // we should use the native asset manager instead
         string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
-        int fd = open(fullpath.c_str(), O_RDONLY);
-        FILE* file = fdopen(fd, "r");
-        off_t start = 0;
-        off_t length;
-        fseek(file, 0, SEEK_END);
-        length = ftell(file);
-        SLresult result;
 
-        // configure audio source
-        SLDataLocator_AndroidFD loc_fd = {SL_DATALOCATOR_ANDROIDFD, fd, start, length};
-        SLDataFormat_MIME format_mime = {SL_DATAFORMAT_MIME, NULL, SL_CONTAINERTYPE_UNSPECIFIED};
-        SLDataSource audioSrc = {&loc_fd, &format_mime};
+        if(fullpath.compare("") != 0)
+        {
+            int fd = open(fullpath.c_str(), O_RDONLY);
+            FILE* file = fdopen(fd, "r");
+            off_t start = 0;
+            off_t length;
+            fseek(file, 0, SEEK_END);
+            length = ftell(file);
+            SLresult result;
 
-        // configure audio sink
-        SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
-        SLDataSink audioSnk = {&loc_outmix, NULL};
+            // configure audio source
+            SLDataLocator_AndroidFD loc_fd = {SL_DATALOCATOR_ANDROIDFD, fd, start, length};
+            SLDataFormat_MIME format_mime = {SL_DATAFORMAT_MIME, NULL, SL_CONTAINERTYPE_UNSPECIFIED};
+            SLDataSource audioSrc = {&loc_fd, &format_mime};
 
-        // create audio player
-        const SLInterfaceID ids[2] = {SL_IID_SEEK, SL_IID_VOLUME};
-        const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
-        result = (*engineEngine)->CreateAudioPlayer(engineEngine, &music->playerObject, &audioSrc, &audioSnk,
-                2, ids, req);
-        DebugTrace("result " << result);
+            // configure audio sink
+            SLDataLocator_OutputMix loc_outmix = {SL_DATALOCATOR_OUTPUTMIX, outputMixObject};
+            SLDataSink audioSnk = {&loc_outmix, NULL};
 
-        // realize the player
-        result = (*music->playerObject)->Realize(music->playerObject, SL_BOOLEAN_FALSE);
-        DebugTrace("result " << result);
+            // create audio player
+            const SLInterfaceID ids[2] = {SL_IID_SEEK, SL_IID_VOLUME};
+            const SLboolean req[2] = {SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE};
+            result = (*engineEngine)->CreateAudioPlayer(engineEngine, &music->playerObject, &audioSrc, &audioSnk, 2, ids, req);
+            DebugTrace("result " << result);
 
-        // get the play interface
-        result = (*music->playerObject)->GetInterface(music->playerObject, SL_IID_PLAY, &music->playInterface);
-        DebugTrace("result " << result);
+            // realize the player
+            result = (*music->playerObject)->Realize(music->playerObject, SL_BOOLEAN_FALSE);
+            DebugTrace("result " << result);
 
-        // get the seek interface
-        result = (*music->playerObject)->GetInterface(music->playerObject, SL_IID_SEEK, &music->seekInterface);
-        DebugTrace("result " << result);
+            // get the play interface
+            result = (*music->playerObject)->GetInterface(music->playerObject, SL_IID_PLAY, &music->playInterface);
+            DebugTrace("result " << result);
 
-        // get the volume interface
-        //result = (*music->playerObject)->GetInterface(music->playerObject, SL_IID_VOLUME, (void *)&music->musicVolumeInterface);
-        
-        DebugTrace("result " << result);
+            // get the seek interface
+            result = (*music->playerObject)->GetInterface(music->playerObject, SL_IID_SEEK, &music->seekInterface);
+            DebugTrace("result " << result);
+
+            // get the volume interface
+            //result = (*music->playerObject)->GetInterface(music->playerObject, SL_IID_VOLUME, (void *)&music->musicVolumeInterface);
+            
+            DebugTrace("result " << result);
+        }
+        else
+        {
+            DebugTrace("Bad path to music file");
+        }
     }
     
     mCurrentMusic = music;
@@ -215,12 +223,10 @@ void JSoundSystem::PlayMusic(JMusic *music, bool looping)
         //(*music->musicVolumeInterface)->SetVolumeLevel(music->musicVolumeInterface, -1 * mVolume);
         
         // enable whole file looping
-        result = (*music->seekInterface)->SetLoop(music->seekInterface,
-                                                  looping?SL_BOOLEAN_TRUE:SL_BOOLEAN_FALSE, 0, SL_TIME_UNKNOWN);
+        result = (*music->seekInterface)->SetLoop(music->seekInterface, looping ? SL_BOOLEAN_TRUE : SL_BOOLEAN_FALSE, 0, SL_TIME_UNKNOWN);
         assert(SL_RESULT_SUCCESS == result);
 
-        result = (*music->playInterface)->SetPlayState(music->playInterface,
-                                                       SL_PLAYSTATE_PLAYING);
+        result = (*music->playInterface)->SetPlayState(music->playInterface, SL_PLAYSTATE_PLAYING);
         assert(SL_RESULT_SUCCESS == result);
     }
 }

JGE/src/decoder_prx.cpp

@@ -19,7 +19,8 @@
  *
  */
  
-#include "../include/decoder_prx.h"
+#include "decoder_prx.h"
+#include <psputility.h>
  
 char *prx_static_init()
 	{

JGE/src/iOS/EAGLView.h

@@ -1,6 +1,5 @@
 #import <UIKit/UIKit.h>
 #import <QuartzCore/QuartzCore.h>
-#import "AdWhirlDelegateProtocol.h"
 #import "EAGLViewController.h"
 #import "EAGLView.h"
 #import "ESRenderer.h"
@@ -8,9 +7,8 @@
 // This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
 // The view content is basically an EAGL surface you render your OpenGL scene into.
 // Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
-@interface EAGLView : UIView<AdWhirlDelegate,UIGestureRecognizerDelegate>
+@interface EAGLView : UIView<UIGestureRecognizerDelegate>
 {    
-    AdWhirlView *adView;
     //This is a trick, AdMob uses a viewController to display its Ads, trust me, you'll need this
     EAGLViewController *viewController;
     
@@ -27,7 +25,6 @@
     id displayLink;
     CGPoint currentLocation;
 }
-@property (nonatomic, retain) AdWhirlView *adView;
 @property (readonly, nonatomic, getter=isAnimating) BOOL animating;
 @property (nonatomic) NSInteger animationFrameInterval;
 @property (nonatomic, readwrite) CGPoint currentLocation;
@@ -37,8 +34,6 @@
 - (void)drawView:(id)sender;
 
 - (void)updateKeyboard: (NSString *) inputString;
-- (void)removeAds;
-- (void)displayAds;
 
 - (void)destroyGame;
 

JGE/src/iOS/EAGLView.m

@@ -12,7 +12,6 @@
 
 #include "GameApp.h"
 
-#import "AdWhirlView.h"
 #import "wagicAppDelegate.h"
 
 
@@ -67,15 +66,10 @@ void DestroyGame(void)
 }
 
 
-#pragma mark Ad management constants
-static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPHONE = @"b86aba511597401ca6b41c1626aa3013";
-static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPAD = @"2e70e3f3da40408588b9a3170c8d268f";
-
 #pragma mark -
 
 @implementation EAGLView
 
-@synthesize adView;
 @synthesize animating;
 @dynamic animationFrameInterval;
 @synthesize currentLocation;
@@ -91,7 +85,6 @@ static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPAD = @"2e70e3f3da40408588b9a3170
 - (void)dealloc
 {
     [renderer release];
-    [self removeAds];	
     [super dealloc];
 }
 
@@ -635,30 +628,6 @@ static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPAD = @"2e70e3f3da40408588b9a3170
     
 }
 
-
-//These are the methods for the AdWhirl Delegate, you have to implement them
-#pragma mark AdWhirlDelegate methods
-
-- (void)adWhirlWillPresentFullScreenModal {
-    //It's recommended to invoke whatever you're using as a "Pause Menu" so your
-    //game won't keep running while the user is "playing" with the Ad (for example, iAds)
-    [self pauseGame];
-
-}
-
-- (void)adWhirlDidDismissFullScreenModal {
-    //Once the user closes the Ad he'll want to return to the game and continue where
-    //he left it
-    [self resumeGame];
-}
-
-- (NSString *)adWhirlApplicationKey {
-    if ((UI_USER_INTERFACE_IDIOM()) == UIUserInterfaceIdiomPad)
-        return _MY_AD_WHIRL_APPLICATION_KEY_IPAD;
-    
-    return _MY_AD_WHIRL_APPLICATION_KEY_IPHONE;
-}
-
 - (UIViewController *)viewControllerForPresentingModalView {
     //Remember that UIViewController we created in the Game.h file? AdMob will use it.
     //If you want to use "return self;" instead, AdMob will cancel the Ad requests.
@@ -666,101 +635,5 @@ static NSString *_MY_AD_WHIRL_APPLICATION_KEY_IPAD = @"2e70e3f3da40408588b9a3170
 }
 
 
-- (void)adWhirlDidReceiveAd:(AdWhirlView *)adWhirlView {
-    [UIView beginAnimations:@"AdWhirlDelegate.adWhirlDidReceiveAd:"
-                    context:nil];
-    BOOL isLandscape = UIDeviceOrientationIsLandscape( [UIDevice currentDevice].orientation);
-    [UIView setAnimationDuration:0.7];
-    
-    CGSize adSize = [adWhirlView actualAdSize];
-    CGRect newFrame = [adWhirlView frame];
-    CGSize screenSize = [self.window bounds].size;
-    
-    newFrame.size = adSize;
-    // ads are 320 x 50
-    newFrame.origin.x = ( (isLandscape ? screenSize.height : screenSize.width) - adSize.width)/ 2;
-    newFrame.origin.y =  ( (isLandscape ? screenSize.width : screenSize.height) - 50);
-    
-    [adWhirlView setFrame: newFrame];
-    
-    [UIView commitAnimations];
-}
-
--(void)adWhirlDidFailToReceiveAd:(AdWhirlView *)adWhirlView usingBackup:(BOOL)yesOrNo {
-    //The code to show my own Ad banner again
-    NSLog(@"failed to get an Ad");
-}
-
--(void) removeAds {
-    //There's something weird about AdWhirl because setting the adView delegate
-    //to "nil" doesn't stops the Ad requests and also it doesn't remove the adView
-    //from superView; do the following to remove AdWhirl from your scene.
-    //
-    //If adView exists, remove everything
-    if (adView) {
-        //Remove adView from superView
-        [adView removeFromSuperview];
-        //Replace adView's view with "nil"
-        [adView replaceBannerViewWith:nil];
-        //Tell AdWhirl to stop requesting Ads
-        [adView ignoreNewAdRequests];
-        //Set adView delegate to "nil"
-        [adView setDelegate:nil];
-        //Release adView
-        [adView release];
-        //set adView to "nil"
-        adView = nil;
-    }
-}
-
-
-
--(void) displayAds 
-{
-    BOOL isLandscape = UIDeviceOrientationIsLandscape( [UIDevice currentDevice].orientation);
-    
-    //Assign the AdWhirl Delegate to our adView
-    if ( adView != nil )
-        [self removeAds];
-    
-    //Let's allocate the viewController (it's the same RootViewController as declared
-    //in our AppDelegate; will be used for the Ads)
-    viewController = [(wagicAppDelegate *)[[UIApplication sharedApplication] delegate] glViewController];
-
-    self.adView = [AdWhirlView requestAdWhirlViewWithDelegate:self];
-    //Set auto-resizing mask
-    self.adView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin;
-    //This isn't really needed but also it makes no harm. It just retrieves the configuration
-    //from adwhirl.com so it knows what Ad networks to use
-    [adView updateAdWhirlConfig];
-    //Get the actual size for the requested Ad
-    CGSize adSize = [adView actualAdSize];
-    //
-    //Set the position; remember that we are using 4 values (in this order): X, Y, Width, Height
-    //You can comment this line if your game is in portrait mode and you want your Ad on the top
-    //if you want the Ad in other position (portrait or landscape), use the following code,
-    //for this example, the Ad will be positioned in the bottom+center of the screen
-    //(in landscape mode):
-    //Same explanation as the one in the method "adjustAdSize" for the Ad's width
-    int screenWidth = [viewController.parentViewController.view bounds].size.width;
-    float yOffset = [viewController.parentViewController.view bounds].size.height - adSize.height;
-    if ( isLandscape )
-    {
-        screenWidth = [viewController.parentViewController.view bounds].size.height;
-        yOffset = screenWidth - adSize.height;
-    }
-
-    self.adView.frame = CGRectMake((screenWidth - adSize.width) / 2, yOffset, adSize.width, adSize.height);
-    
-    //Trying to keep everything inside the Ad bounds
-    self.adView.clipsToBounds = YES;
-    //Adding the adView (used for our Ads) to our viewController
-    [viewController.view addSubview:adView];
-    //Bring our view to front
-    [viewController.view bringSubviewToFront:adView];
-    
-}
-
-
 @end
 

JGE/src/iOS/EAGLViewController.h

@@ -1,5 +1,4 @@
 #import <UIKit/UIKit.h>
-#import "AdWhirlDelegateProtocol.h"
 
 @interface EAGLViewController : UIViewController<UITextFieldDelegate> {
 
@@ -11,5 +10,6 @@ void resumeGame();
 @property (nonatomic, retain) id eaglView;
 @property (nonatomic, retain) UITextField *inputField;
 @property (nonatomic, assign) BOOL bannerIsVisible;
+- (void)toggleKeyboardWithState: (NSString *) initialText;
 
 @end

JGE/src/iOS/EAGLViewController.m

@@ -25,10 +25,13 @@
         [inputField setAutocapitalizationType:UITextAutocapitalizationTypeNone];
         [inputField setAutocorrectionType:UITextAutocorrectionTypeNo];
         [inputField setKeyboardType: UIKeyboardTypeNamePhonePad];
+
         CGRect frame = [[UIScreen mainScreen] applicationFrame];
         eaglView = [[EAGLView alloc] initWithFrame:frame];
+
         [self setView: eaglView];
         [self.view addSubview: inputField];
+
         [inputField release];
     }
     return self;
@@ -50,39 +53,39 @@
 
 - (void)viewWillAppear:(BOOL)animated {
 	NSLog(@"EAGL ViewController - view Will Appear");
-    [self.view resumeGame];	
+    [(id)self.view resumeGame];
 }
 
 
 - (void)viewWillDisappear:(BOOL)animated
 {
-    [self.view pauseGame];
+    [(id)self.view pauseGame];
 }
 
 - (void)pauseGame
 {
-    [self.view pauseGame];
+    [(id)self.view pauseGame];
 }
 
 - (void)resumeGame
 {
-    [self.view resumeGame];
+    [(id)self.view resumeGame];
 }
 
 - (void)endGame
 {
-    [self.view endGame];
+    [(id)self.view endGame];
 }
 
 - (void)viewDidAppear:(BOOL)animated {
-	
+
 	NSLog(@"EAGL ViewController - view Did Appear");
-	
+
 	UIDeviceOrientation currentDeviceOrientation = [UIDevice currentDevice].orientation;
 	UIInterfaceOrientation currentInterfaceOrientation	= self.interfaceOrientation;
-	
-	NSLog(@"Current Interface: %@. Current Device: %@", 
-		  [self interfaceOrientationName:currentInterfaceOrientation], 
+
+	NSLog(@"Current Interface: %@. Current Device: %@",
+		  [self interfaceOrientationName:currentInterfaceOrientation],
 		  [self deviceOrientationName:currentDeviceOrientation]);
 }
 
@@ -91,7 +94,7 @@
 - (void)didReceiveMemoryWarning {
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];
-    
+
     // Release any cached data, images, etc. that aren't in use.
 }
 
@@ -103,6 +106,25 @@
 }
 
 #pragma mark - device orientation handlers
+- (NSUInteger)supportedInterfaceOrientations
+{
+    //I want to support portrait in ABCView at iPhone only.
+    //and support all orientation in other views and iPad.
+
+    if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone)
+    {
+        return UIInterfaceOrientationMaskLandscape;
+    }
+
+    //support all
+    return UIInterfaceOrientationMaskAll;
+}
+
+
+-(BOOL)shouldAutorotate {
+
+    return YES;
+}
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
     // Overriden to allow any orientation.
@@ -110,23 +132,23 @@
 
     if ( isSmallScreen && UIInterfaceOrientationIsPortrait(interfaceOrientation))
         return NO;
-    
+
     return YES;
 }
 
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
-    [[eaglView adView] rotateToOrientation: toInterfaceOrientation];
+    //   [[eaglView adView] rotateToOrientation: toInterfaceOrientation];
 }
 
 
 #pragma mark -
 #pragma mark Orientation Information
 - (NSString*)interfaceOrientationName:(UIInterfaceOrientation) interfaceOrientation {
-	
+
 	NSString* result = nil;
-	
+
 	switch (interfaceOrientation) {
-			
+
 		case UIInterfaceOrientationPortrait:
 			result = @"Portrait";
 			break;
@@ -142,16 +164,16 @@
 		default:
 			result = @"Unknown Interface Orientation";
 	}
-	
+
 	return result;
 };
 
 - (NSString*)deviceOrientationName:(UIDeviceOrientation) deviceOrientation {
-	
+
 	NSString* result = nil;
-	
+
 	switch (deviceOrientation) {
-			
+
 		case UIDeviceOrientationUnknown:
 			result = @"Unknown";
 			break;
@@ -176,7 +198,7 @@
 		default:
 			result = @"Unknown Device Orientation";
 	}
-	
+
 	return result;
 };
 
@@ -205,7 +227,7 @@
         [eaglView updateKeyboard: @"CLEAR"];
     else
         [eaglView updateKeyboard: string];
-    
+
     return YES;
 }
 
@@ -215,7 +237,7 @@
 }
 
 
-- (BOOL) textFieldShouldReturn:(UITextField *)textField 
+- (BOOL) textFieldShouldReturn:(UITextField *)textField
 {
     [eaglView updateKeyboard: @"SAVE"];
 	[textField resignFirstResponder];

JGE/src/iOS/ES2Renderer.m

@@ -33,7 +33,7 @@ bool checkFramebufferStatus();
         context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
         if ( context == nil)
             context = [[EAGLContext alloc] initWithAPI: kEAGLRenderingAPIOpenGLES1];
-                       
+
         if (!context || ![EAGLContext setCurrentContext:context])
         {
             [self release];
@@ -46,20 +46,29 @@ bool checkFramebufferStatus();
 
 - (void)render
 {
-//	NSLog(@"Renderer - render");
-
 	struct timeval tv;
 	uint dt;
-    
+
 	// This application only creates a single context which is already set current at this point.
     // This call is redundant, but needed if dealing with multiple contexts.
     [EAGLContext setCurrentContext:context];
-	
+
 	// This application only creates a single default framebuffer which is already bound at this point.
     // This call is redundant, but needed if dealing with multiple framebuffers.
     glBindFramebuffer(GL_FRAMEBUFFER, defaultFramebuffer);
+    GLfloat currentRatio = (GLfloat) backingWidth / (GLfloat) backingHeight;
 
-	if ((GLfloat)backingWidth / (GLfloat)backingHeight < ACTUAL_RATIO)
+    // for retina devices.  because of the 568 px, the ratio between height-width skews the
+    // frame a bit
+
+    if ( backingHeight == 568 || backingWidth == 568) {
+		viewPort.left = 0;
+		viewPort.top = -((backingWidth/ACTUAL_RATIO)-backingHeight)/2  + 22; // account for status bar
+		viewPort.right = backingWidth;
+		viewPort.bottom = -((backingWidth/ACTUAL_RATIO)-backingHeight)/2 + backingWidth / ACTUAL_RATIO - 22;
+
+    }
+	else if (currentRatio < ACTUAL_RATIO)
 	{
 		viewPort.left = 0;
 		viewPort.top = -((backingWidth/ACTUAL_RATIO)-backingHeight)/2;
@@ -73,21 +82,21 @@ bool checkFramebufferStatus();
 		viewPort.right = backingHeight * ACTUAL_RATIO;
 		viewPort.bottom = -((backingWidth/ACTUAL_RATIO)-backingHeight)/2 + backingWidth / ACTUAL_RATIO + backingHeight;
 	}
-	
+
 	glViewport(viewPort.left, viewPort.top, viewPort.right-viewPort.left, viewPort.bottom-viewPort.top);
 
 	JRenderer::GetInstance()->SetActualWidth(viewPort.right-viewPort.left);
 	JRenderer::GetInstance()->SetActualHeight(viewPort.bottom-viewPort.top);
-	
-	
+
+
 	gettimeofday(&tv, NULL);
 	uint64_t tickCount = tv.tv_sec * 1000 + tv.tv_usec / 1000;
 	dt = (tickCount - lastTickCount);
 	lastTickCount = tickCount;
-	
+
 	g_engine->SetDelta((float)dt / 1000.0f);
 	g_engine->Update((float)dt / 1000.0f);
-	
+
 	g_engine->Render();
 
     // This application only creates a single color renderbuffer which is already bound at this point.
@@ -103,18 +112,18 @@ bool checkFramebufferStatus();
 		glDeleteFramebuffers(1, &defaultFramebuffer);
 		defaultFramebuffer = 0;
 	}
-	
+
 	if(colorRenderbuffer) {
 		glDeleteRenderbuffers(1, &colorRenderbuffer);
 		colorRenderbuffer = 0;
 	}
-	
+
 	glGenFramebuffers(1, &defaultFramebuffer);
 	glBindFramebuffer(GL_FRAMEBUFFER, defaultFramebuffer);
-	
+
 	glGenRenderbuffers(1, &colorRenderbuffer);
 	glBindRenderbuffer(GL_RENDERBUFFER, colorRenderbuffer);
-	
+
     // Allocate color buffer backing based on the current layer size
 	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, colorRenderbuffer);
     [context renderbufferStorage:GL_RENDERBUFFER fromDrawable:layer];
@@ -127,41 +136,41 @@ bool checkFramebufferStatus();
 	glEnable(GL_TEXTURE_2D);
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_CULL_FACE);				// do not calculate inside of poly's
-	glFrontFace(GL_CCW);	
+	glFrontFace(GL_CCW);
 	glEnable (GL_BLEND);
- 	
+
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//	glEnable(GL_SCISSOR_TEST);				// Enable Clipping
+    //	glEnable(GL_SCISSOR_TEST);				// Enable Clipping
 
 	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);		// Black Background (yes that's the way fuckers)
 	glClearDepthf(1.0f);					// Depth Buffer Setup
-		
+
     return YES;
 }
 
 bool checkFramebufferStatus() {
-	
+
     GLenum status = (GLenum)glCheckFramebufferStatus(GL_FRAMEBUFFER);
-	
+
     switch(status) {
-			
+
         case GL_FRAMEBUFFER_COMPLETE:
             return true;
-			
+
         case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
             printf("Framebuffer incomplete,incomplete attachment\n");
             return false;
-			
+
         case GL_FRAMEBUFFER_UNSUPPORTED:
             printf("Unsupported framebuffer format\n");
             return false;
-			
+
         case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
             printf("Framebuffer incomplete,missing attachment\n");
             return false;
-			
+
     }
-	
+
 	return false;
 }
 
@@ -187,7 +196,7 @@ bool checkFramebufferStatus() {
 
     [context release];
     context = nil;
-
+    
     [super dealloc];
 }
 

JGE/src/iOS/wagicAppDelegate.m

@@ -17,7 +17,7 @@
 - (void) updateComplete: (id) notificationMsg
 {
     NSNotificationCenter *dnc = [NSNotificationCenter defaultCenter];
- 
+
     [dnc removeObserver: self name: @"coreComplete" object: nil];
     [dnc removeObserver: self name: @"iosConfigComplete" object: nil];
     [dnc postNotificationName: @"initializeGame" object: self];
@@ -34,12 +34,12 @@
 - (void) downloadResources
 {
     NSNotificationCenter *dnc = [NSNotificationCenter defaultCenter];
-    
+
 	[dnc addObserver:self selector:@selector(initIosUpdate:) name:@"coreComplete" object: nil];
 
     wagicDownloadController = [[WagicDownloadProgressViewController alloc] init];
     [wagicDownloadController performSelectorInBackground: @selector(startDownload:) withObject:@"core"];
-    
+
     [self.window addSubview: wagicDownloadController.view];
     [self.window makeKeyWindow];
 
@@ -51,16 +51,16 @@
     NSString *pathPrefix = nil;
     if ( pathNamePrefix == nil ) // default to User
         pathPrefix = @"User";
-    else 
+    else
         pathPrefix = pathNamePrefix;
-    
+
     NSError *error = nil;
-    
+
     NSFileManager *fm = [NSFileManager defaultManager];
     NSArray *paths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *userDocumentsDirectory = [paths objectAtIndex:0];
     NSString *downloadFilePath =  [userDocumentsDirectory stringByAppendingString: [NSString stringWithFormat: @"/%@/%@.zip", pathPrefix, folderName]];
-    
+
     ZipArchive *za = [[ZipArchive alloc] init];
     if ([za UnzipOpenFile: downloadFilePath])
     {
@@ -73,7 +73,7 @@
             NSLog(@"An Error occurred while unpacking zip file.");
         }
         [za UnzipCloseFile];
-        
+
         if (ret == YES)
         {
             // delete the archive
@@ -85,7 +85,7 @@
         }
     }
     [za release], za = nil;
-    
+
 }
 
 
@@ -98,15 +98,15 @@
     {
         NSString *pathname = [NSString stringWithFormat: @"%@/%@", path, filename];
         [data appendFormat: @"%@\n", pathname];
-        
+
         BOOL isDirectory = [[fileManager attributesOfItemAtPath: pathname error: nil] objectForKey: NSFileType] == NSFileTypeDirectory;
         if (isDirectory)
             [data appendString: [self getDirContents: pathname]];
     }
-    
+
     NSString *manifestList = [data stringByAppendingFormat: @"\n"];
     [data release];
-    
+
     return manifestList;
 }
 
@@ -114,37 +114,37 @@
 {
     NSString *manifestFile = [docsPath stringByAppendingPathComponent:@"Manifest"];
     [[self getDirContents: docsPath] writeToFile:manifestFile atomically:YES encoding:NSUTF8StringEncoding error: nil];
-   
+
 }
 
 /**
- check for any zip files dropped into the documents directory before loading the game.  
- If so, move the "core" files into the "Res" directory and move all other zip files into the "User" directory. 
+ check for any zip files dropped into the documents directory before loading the game.
+ If so, move the "core" files into the "Res" directory and move all other zip files into the "User" directory.
  Check for a "core" zip file in the Res directory. If it exists, then return YES. Otherwise, return NO.
  */
 
 - (void) initializeResources
 {
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    
+
     NSArray *paths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *docsPath = [paths objectAtIndex: 0];
     NSArray *docsPathContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: docsPath error:nil];
     NSString *versionPredicate = [NSString stringWithFormat: @"(self  BEGINSWITH '%@')", [NSString stringWithCString: WAGIC_CORE_VERSION_STRING encoding:NSUTF8StringEncoding]];
     NSCompoundPredicate *compoundPredicate = [[NSCompoundPredicate alloc] initWithType:NSAndPredicateType subpredicates: [NSArray arrayWithObjects: [NSPredicate predicateWithFormat:@"self ENDSWITH '.zip'"], [NSPredicate predicateWithFormat: [NSString stringWithFormat: @" NOT ( %@ ) ", versionPredicate]], nil]];
-    
+
     NSArray *coreFiles = [docsPathContents filteredArrayUsingPredicate:[NSPredicate predicateWithFormat: versionPredicate]];
 
     NSArray *resourceZipFiles = [docsPathContents filteredArrayUsingPredicate: compoundPredicate];
     NSString *userPath = [NSString stringWithFormat: @"%@/User", docsPath];
     NSString *resPath = [NSString stringWithFormat: @"%@/Res", docsPath];
     NSError *error = nil;
-    
+
     [compoundPredicate release], compoundPredicate = nil;
-    
+
     if ( ([resourceZipFiles count]  > 0 ) &&  ![fileManager fileExistsAtPath: userPath] )
         [fileManager createDirectoryAtPath: userPath withIntermediateDirectories: YES attributes:nil error:nil ];
-    
+
     for (NSString *zipFile in resourceZipFiles)
     {
         NSString *oldPath = [NSString stringWithFormat: @"%@/%@", docsPath, zipFile];
@@ -155,7 +155,7 @@
             [fileManager removeItemAtPath: newPath error: &error];
         }
         error = nil;
-        
+
         [fileManager moveItemAtPath: oldPath toPath:newPath error: &error];
         NSLog(@"Moving %@ to %@", oldPath, newPath);
         if ( error != nil )
@@ -175,7 +175,7 @@
             [fileManager removeItemAtPath: newPath error: &error];
         }
         error = nil;
-        
+
         [fileManager moveItemAtPath: oldPath toPath:newPath error: &error];
         NSLog(@"Moving %@ to %@", oldPath, newPath);
         if ( error != nil )
@@ -187,21 +187,21 @@
 }
 
 - (BOOL) hasResourceFiles
-{   
+{
     NSArray *paths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *docsPath = [paths objectAtIndex: 0];
     NSString *resPath = [NSString stringWithFormat: @"%@/Res", docsPath];
-    
+
     NSArray *resDirContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: resPath error:nil];
     NSString *versionPredicate = [NSString stringWithFormat: @"(self  BEGINSWITH '%@')", [NSString stringWithCString: WAGIC_CORE_VERSION_STRING encoding:NSUTF8StringEncoding]];
 
     NSArray *coreFiles = [resDirContents filteredArrayUsingPredicate:[NSPredicate predicateWithFormat: versionPredicate]];
-    
+
     if ([coreFiles count] >= 2)
     {
         return YES;
     }
-    
+
     return NO;
 }
 
@@ -211,30 +211,30 @@
     NSString *docsPath = [NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex: 0];
     NSFileManager *fm = [NSFileManager defaultManager];
     NSString *userPath = [docsPath stringByAppendingString: @"/User"];
-    
+
     NSArray *userDirectories = [fm contentsOfDirectoryAtPath: userPath error: nil];
 
     for (NSString *userFilename in userDirectories)
     {
         NSString *userPathname = [userPath stringByAppendingFormat: @"/%@", userFilename];
         NSString *zipFileName = [userPathname stringByAppendingString: @".zip"];
-        
+
         if ([[fm attributesOfItemAtPath: userPathname error: nil] objectForKey: NSFileType] == NSFileTypeDirectory && ([fm fileExistsAtPath:zipFileName]))
         {
             [self unpackageResources: userFilename pathPrefixName: @"User"];
             [fm removeItemAtPath: zipFileName error: nil];
         }
-        
+
         else if ( [userFilename hasPrefix: @"ai_decks"] ) // special case to allow manual override of AI decks in User directory
         {
             [self unpackageResources: @"ai_decks" pathPrefixName: @"User/ai/baka"];
         }
     }
     // scan for deck*.txt and collection.dat as well as options.txt in the Documents directory and copy them into the player directory
-    NSArray *playerDataFilePredicates = [NSArray arrayWithObjects: 
-                                         [NSPredicate predicateWithFormat: @"SELF BEGINSWITH[cd] 'deck' AND SELF ENDSWITH '.txt'"], 
-                                         [NSPredicate predicateWithFormat: @"SELF BEGINSWITH[cd] 'options' AND SELF ENDSWITH '.txt'"], 
-                                         [NSPredicate predicateWithFormat: @"SELF BEGINSWITH[cd] 'tasks' AND SELF ENDSWITH '.dat'"], 
+    NSArray *playerDataFilePredicates = [NSArray arrayWithObjects:
+                                         [NSPredicate predicateWithFormat: @"SELF BEGINSWITH[cd] 'deck' AND SELF ENDSWITH '.txt'"],
+                                         [NSPredicate predicateWithFormat: @"SELF BEGINSWITH[cd] 'options' AND SELF ENDSWITH '.txt'"],
+                                         [NSPredicate predicateWithFormat: @"SELF BEGINSWITH[cd] 'tasks' AND SELF ENDSWITH '.dat'"],
                                          [NSPredicate predicateWithFormat: @"SELF BEGINSWITH[cd] 'collection' AND SELF ENDSWITH '.dat'"], nil];
 
     NSCompoundPredicate *playerDataPredicate = [[NSCompoundPredicate alloc] initWithType:NSOrPredicateType subpredicates: playerDataFilePredicates];
@@ -246,23 +246,23 @@
         NSString *toPath = [docsPath stringByAppendingFormat: @"/User/player/%@", [file lowercaseString]];
         [fm moveItemAtPath: fromPath toPath: toPath error: nil];
     }
-    
+
     [playerDataPredicate release], playerDataPredicate = nil;
-    
+
     [self createManifest: docsPath];
-    
+
     [[NSNotificationCenter defaultCenter] postNotificationName: @"readyToStartGame" object: nil];
 }
 
 
 - (void) startGame
 {
-    if (glViewController != nil) 
+    if (glViewController != nil)
         [glViewController release];
     glViewController = [[EAGLViewController alloc] init];
-    
+
     [[[self.window subviews] lastObject] removeFromSuperview];
-    [self.window addSubview:self.glViewController.view];
+    [self.window setRootViewController: glViewController];
 
     NSNotificationCenter *dnc = [NSNotificationCenter defaultCenter];
 	[dnc removeObserver: self name: @"intializeGame" object: nil];
@@ -286,7 +286,7 @@
     [internetReach release];
     [glViewController release];
     [wagicDownloadController release];
-    
+
     [super dealloc];
 }
 
@@ -298,23 +298,23 @@
     hostReach = [[Reachability reachabilityForGoogleDNS] retain];
     internetReach = [[Reachability reachabilityForInternetConnection] retain];
     wifiReach = [[Reachability reachabilityForLocalWiFi] retain];
-    
+
     [hostReach startNotifier];
     [internetReach startNotifier];
     [wifiReach startNotifier];
 }
 
 
-- (BOOL) application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions 
+- (BOOL) application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     self.glViewController = nil;
-    
+
     [self setupNetworkListeners];
 
     NSNotificationCenter *dnc = [NSNotificationCenter defaultCenter];
 	[dnc addObserver:self selector:@selector(preGameInitialization) name:@"initializeGame" object: nil];
 	[dnc addObserver:self selector:@selector(startGame) name:@"readyToStartGame" object: nil];
-    
+
     [self initializeResources];
     // check to see if the Res folder exists.  If it does continue
     // otherwise bring up the download dialog and download the core files
@@ -328,7 +328,7 @@
     {
         [self preGameInitialization];
     }
-    
+
     [self.window setBackgroundColor: [UIColor blackColor]];
     [self.window makeKeyAndVisible];
 
@@ -337,7 +337,7 @@
 
 - (void)applicationWillTerminate:(UIApplication *)application
 {
-        [self.glViewController.view destroyGame];
+    [(id)self.glViewController.view destroyGame];
 }
 
 - (void)initializeKeyboard: (id) initialState
@@ -345,31 +345,18 @@
     [self.glViewController toggleKeyboardWithState: initialState];
 }
 
-- (void) handleWEngineCommand:(NSString *) command 
-             withUIParameters: (CGFloat) x 
-                  yCoordinate: (CGFloat) y 
-                        width: (CGFloat) width 
+- (void) handleWEngineCommand:(NSString *) command
+             withUIParameters: (CGFloat) x
+                  yCoordinate: (CGFloat) y
+                        width: (CGFloat) width
                        height: (CGFloat) height
 {
 }
 
 - (void)handleWEngineCommand:(NSString *) command withParameter: (NSString *) parameter
 {
-    BOOL isDevicePhone = (UI_USER_INTERFACE_IDIOM()) == UIUserInterfaceIdiomPhone;
 
-    if ([command isEqualToString: @"entergamestate:menu"] )
-        [glViewController.eaglView displayAds];
-    
-    else if ([command isEqualToString: @"enterduelphase:end"] && isDevicePhone)
-        [glViewController.eaglView displayAds];
-    
-    else if ([command isEqualToString: @"leaveduelphase:end"] || 
-                [command isEqualToString: @"leavegamestate:menu"])
-    {
-        if (isDevicePhone)
-            [glViewController.eaglView removeAds];
-    }
-    else if ([command isEqualToString: @"displayKeyboard"])
+    if ([command isEqualToString: @"displayKeyboard"])
     {
         [self initializeKeyboard: parameter];
     }
@@ -379,16 +366,17 @@
 }
 
 
+
 - (void) rotateBackgroundImage:(UIInterfaceOrientation)fromInterfaceOrientation toInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
 {
 	bool isPhone = (UI_USER_INTERFACE_IDIOM()) == UIUserInterfaceIdiomPhone;
-    
-	if (isPhone) 
+
+	if (isPhone)
     {
         UIImage *bgImage = [UIImage imageNamed: @"Default-Portrait.png"];
         [[[self.window subviews] objectAtIndex: 0] setBackgroundColor: [UIColor colorWithPatternImage: bgImage]];
 	}
-	else 
+	else
     {
         [self.window setBackgroundColor: [UIColor clearColor]];
 		if (UIInterfaceOrientationIsLandscape( toInterfaceOrientation)) {
@@ -410,12 +398,12 @@
 {
 	BOOL netAvailable = NO;
     //NSDate *startTime = [[[NSDate alloc ] init] autorelease];
-	
+
     hostReach = [[Reachability reachabilityForGoogleDNS] retain];
-    
+
     NetworkStatus netStatus = [hostReach currentReachabilityStatus];
-    
-	
+
+
 	if (netStatus == ReachableViaWiFi || netStatus == ReachableViaWWAN)	{
 		netAvailable = YES;
 	}

JGE/src/pc/JGfx.cpp

@@ -12,7 +12,7 @@
 #if (!defined IOS) && (!defined QT_CONFIG)
 #ifdef WIN32
 #pragma warning(disable : 4786)
-#pragma comment( lib, "giflib.lib" )
+//#pragma comment( lib, "giflib.lib" )
 #endif
 
 #include <png.h>
@@ -310,10 +310,13 @@ void JQuad::SetTextureRect(float x, float y, float w, float h)
     mWidth = w;
     mHeight = h;
 
-    mTX0 = x/mTex->mTexWidth;
-    mTY0 = y/mTex->mTexHeight;
-    mTX1 = (x+w)/mTex->mTexWidth;
-    mTY1 = (y+h)/mTex->mTexHeight;
+    if(mTex)
+    {
+        mTX0 = x/mTex->mTexWidth;
+        mTY0 = y/mTex->mTexHeight;
+        mTX1 = (x+w)/mTex->mTexWidth;
+        mTY1 = (y+h)/mTex->mTexHeight;
+    }
 }
 
 
@@ -340,7 +343,7 @@ void JQuad::SetHotSpot(float x, float y)
 
 //////////////////////////////////////////////////////////////////////////
 
-JTexture::JTexture() : mBuffer(NULL)
+JTexture::JTexture() : mWidth(0), mHeight(0), mBuffer(NULL)
 {
     mTexId = -1;
 }
@@ -820,7 +823,7 @@ void JRenderer::BeginScene()
     esMatrixLoadIdentity(&theMvpMatrix);
     esOrtho(&theMvpMatrix, 0.0f, SCREEN_WIDTH_F, 0.0f, SCREEN_HEIGHT_F-1.0f,-1.0f, 1.0f);
 #endif //(!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0)
-#if (defined WIN32) || ((defined GL_VERSION_ES_CM_1_1) && (!defined IOS))
+#if (defined WIN32 && !defined GL_ES_VERSION_2_0) || ((defined GL_VERSION_ES_CM_1_1) && (!defined IOS))
     float scaleH = mActualHeight/SCREEN_HEIGHT_F;
     float scaleW = mActualWidth/SCREEN_WIDTH_F;
     if (scaleH != 1.0f || scaleW != 1.0f)
@@ -840,7 +843,7 @@ void JRenderer::EndScene()
 void JRenderer::BindTexture(JTexture *tex)
 {
     checkGlError();
-    if (mCurrentTex != tex->mTexId)
+    if (tex && mCurrentTex != tex->mTexId)
     {
         mCurrentTex = tex->mTexId;
 
@@ -1584,7 +1587,7 @@ void JRenderer::Plot(float x, float y, PIXEL_TYPE color)
     glEnd();
     glColor4ub(255, 255, 255, 255);
 #else
-    // FIXME, not used
+    cerr << x << " " << y << " " << color << endl;
 #endif //#if (!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0)
     glEnable(GL_TEXTURE_2D);
     checkGlError();
@@ -1606,6 +1609,7 @@ void JRenderer::PlotArray(float *x, float *y, int count, PIXEL_TYPE color)
     glColor4ub(255, 255, 255, 255);
 #else
     // FIXME, not used
+    cerr << x << " " << y << " " << count << " " << " " << color << endl;
 #endif //#if (!defined GL_ES_VERSION_2_0) && (!defined GL_VERSION_2_0)
     glEnable(GL_TEXTURE_2D);
     checkGlError();
@@ -1800,7 +1804,7 @@ static void PNGCustomReadDataFn(png_structp png_ptr, png_bytep data, png_size_t
 {
     png_size_t check;
 
-    JFileSystem *fileSystem = (JFileSystem*)png_ptr->io_ptr;
+    JFileSystem *fileSystem = (JFileSystem*)png_get_io_ptr(png_ptr);
 
     check = fileSystem->ReadFile(data, length);
 
@@ -1883,7 +1887,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
         //fclose(fp);
         fileSystem->CloseFile();
 
-        png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+        png_destroy_read_struct(&png_ptr, NULL, NULL);
 
         return JGE_ERR_PNG;
     }
@@ -1892,11 +1896,15 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
 
     png_set_sig_bytes(png_ptr, sig_read);
     png_read_info(png_ptr, info_ptr);
-    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, int_p_NULL, int_p_NULL);
+    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL);
     png_set_strip_16(png_ptr);
     png_set_packing(png_ptr);
     if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_palette_to_rgb(png_ptr);
+#if PNG_LIBPNG_VER >= 10400
+    if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);
+#else
     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr);
+#endif
     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
     png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
 
@@ -1906,7 +1914,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
         //fclose(fp);
         fileSystem->CloseFile();
 
-        png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+        png_destroy_read_struct(&png_ptr, NULL, NULL);
         return JGE_ERR_MALLOC_FAILED;
     }
 
@@ -1928,7 +1936,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
 
         for (y = 0; y < (int)height; y++)
         {
-            png_read_row(png_ptr, (BYTE*) line, png_bytep_NULL);
+            png_read_row(png_ptr, (BYTE*) line, NULL);
             for (x = 0; x < (int)width; x++)
             {
                 DWORD color32 = line[x];
@@ -1951,7 +1959,7 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
     free (line);
 
     png_read_end(png_ptr, info_ptr);
-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 
     fileSystem->CloseFile();
 
@@ -1994,8 +2002,15 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
     GifFileType *GifFileIn = NULL;
     ColorMapObject *palette;
     int ExtCode;
+
+#if GIFLIB_MAJOR >= 5
+    if ((GifFileIn = DGifOpen(handle, readFunc, NULL)) == NULL)
+        return 1;
+#else
     if ((GifFileIn = DGifOpen(handle, readFunc)) == NULL)
         return 1;
+#endif
+
     *bgcolor = 0;
     textureInfo.mWidth = 0;
     textureInfo.mHeight = 0;
@@ -2004,7 +2019,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
     do {
         if (DGifGetRecordType(GifFileIn, &RecordType) == GIF_ERROR)
         {
+#if GIFLIB_MAJOR >= 5
+            DGifCloseFile(GifFileIn, NULL);
+#else
             DGifCloseFile(GifFileIn);
+#endif
             return 1;
         }
 
@@ -2013,12 +2032,20 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
             {
                 if (DGifGetImageDesc(GifFileIn) == GIF_ERROR)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 if((palette = (GifFileIn->SColorMap != NULL) ? GifFileIn->SColorMap : GifFileIn->Image.ColorMap) == NULL)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 textureInfo.mWidth = GifFileIn->Image.Width;
@@ -2026,7 +2053,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 *bgcolor = gif_color32(GifFileIn->SBackGroundColor);
                 if((LineIn = (GifRowType) malloc(GifFileIn->Image.Width * sizeof(GifPixelType))) == NULL)
                 {
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 textureInfo.mTexWidth = getNextPower2(GifFileIn->Image.Width);
@@ -2036,7 +2067,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 if((p32 = (DWORD *)malloc(sizeof(PIXEL_TYPE) * textureInfo.mTexWidth * textureInfo.mTexHeight)) == NULL)
                 {
                     free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
                 DWORD * curr = p32;
@@ -2048,7 +2083,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                     {
                         free((void *)p32);
                         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                        DGifCloseFile(GifFileIn, NULL);
+#else
                         DGifCloseFile(GifFileIn);
+#endif
                         return 1;
                     }
                     for (GifWord j = 0; j < GifFileIn->Image.Width; j ++)
@@ -2077,7 +2116,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                 }
                 if(LineIn != NULL)
                     free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                DGifCloseFile(GifFileIn, NULL);
+#else
                 DGifCloseFile(GifFileIn);
+#endif
                 return 1;
             }
             while (Extension != NULL) {
@@ -2090,7 +2133,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
                     }
                     if(LineIn != NULL)
                         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+                    DGifCloseFile(GifFileIn, NULL);
+#else
                     DGifCloseFile(GifFileIn);
+#endif
                     return 1;
                 }
             }
@@ -2105,7 +2152,11 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg
 
     if(LineIn != NULL)
         free((void *)LineIn);
+#if GIFLIB_MAJOR >= 5
+    DGifCloseFile(GifFileIn, NULL);
+#else
     DGifCloseFile(GifFileIn);
+#endif
 
     return 0;
 }
@@ -2242,7 +2293,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm
     return tex;
 }
 #elif (defined QT_CONFIG)
-JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureFormat __attribute__((unused)))
+JTexture* JRenderer::LoadTexture(const char* filename, int, int)
 {
     JTexture *tex = NULL;
     int rawsize = 0;
@@ -2482,7 +2533,7 @@ void JRenderer::Enable2D()
 #if (defined GL_VERSION_ES_CM_1_1) || (defined GL_OES_VERSION_1_1)
     glOrthof(0.0f, SCREEN_WIDTH_F, 0.0f, SCREEN_HEIGHT_F-1.0f, -1.0f, 1.0f);
 #else
-    gluOrtho2D(0.0f, SCREEN_WIDTH_F, 0.0f, SCREEN_HEIGHT_F-1.0f);
+    glOrtho(0.0f, SCREEN_WIDTH_F, 0.0f, SCREEN_HEIGHT_F-1.0f, -1.0f, 1.0f);
 #endif
 
     glMatrixMode (GL_MODELVIEW);										// Select The Modelview Matrix
@@ -2518,7 +2569,7 @@ void JRenderer::Enable3D()
 }
 
 
-void JRenderer::SetClip(int x, int y, int width, int height)
+void JRenderer::SetClip(int, int, int, int)
 {// NOT USED
     //glScissor(x, y, width, height);
 }
@@ -2530,25 +2581,25 @@ void JRenderer::LoadIdentity()
 }
 
 
-void JRenderer::Translate(float x, float y, float z)
+void JRenderer::Translate(float, float, float)
 {// NOT USED
     //glTranslatef(x, y, z);
 }
 
 
-void JRenderer::RotateX(float angle)
+void JRenderer::RotateX(float)
 {// NOT USED
     //glRotatef(angle*RAD2DEG, 1.0f, 0.0f, 0.0f);
 }
 
 
-void JRenderer::RotateY(float angle)
+void JRenderer::RotateY(float)
 {// NOT USED
     //glRotatef(angle*RAD2DEG, 0.0f, 1.0f, 0.0f);
 }
 
 
-void JRenderer::RotateZ(float angle)
+void JRenderer::RotateZ(float)
 {// NOT USED
     //glRotatef(angle*RAD2DEG, 0.0f, 0.0f, 1.0f);
 }

JGE/src/pc/JSfx.cpp

@@ -22,6 +22,8 @@
 JMusic::JMusic()
 #ifdef USE_PHONON
   : mOutput(0), mMediaObject(0)
+#elif defined QT_CONFIG
+    : playlist(0), player(0)
 #endif
 {
 }
@@ -40,11 +42,16 @@ int JMusic::getPlayTime(){
 
 JMusic::~JMusic()
 {
-#ifdef USE_PHONON
+#if defined USE_PHONON
   if(mOutput)
     delete mOutput;
   if(mMediaObject)
     delete mMediaObject;
+#elif defined QT_CONFIG
+    if(player)
+        delete player;
+    if(playlist)
+        delete playlist;
 #elif defined WITH_FMOD
   JSoundSystem::GetInstance()->StopMusic(this);
   if (mTrack) FSOUND_Sample_Free(mTrack);
@@ -69,7 +76,10 @@ JSample::JSample()
 
 JSample::~JSample()
 {
-#ifdef USE_PHONON
+#if (defined QT_CONFIG) && (!defined USE_PHONON)
+    if(effect)
+        delete effect;
+#elif USE_PHONON
   if(mOutput)
     delete mOutput;
   if(mMediaObject)
@@ -144,78 +154,108 @@ void JSoundSystem::DestroySoundSystem()
 
 JMusic *JSoundSystem::LoadMusic(const char *fileName)
 {
-#ifdef USE_PHONON
-  JMusic* music = new JMusic();
-  if (music)
-  {
-    music->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0);
-    music->mMediaObject = new Phonon::MediaObject(0);
-    string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
-    music->mMediaObject->setCurrentSource(QString(fullpath.c_str()));
-    Phonon::Path mediapath = Phonon::createPath(music->mMediaObject, music->mOutput);
-    Q_ASSERT(mediapath.isValid());
-  }
-  return music;
-#elif (defined WITH_FMOD)
-  JMusic* music = new JMusic();
-  if (music)
+    JMusic* music = NULL;
+#if (defined QT_CONFIG)  && (!defined USE_PHONON)
+    music = new JMusic();
+    if (music)
     {
-      JFileSystem* fileSystem = JFileSystem::GetInstance();
-      if (fileSystem->OpenFile(fileName))
-	{
-	  int size = fileSystem->GetFileSize();
-	  char *buffer = new char[size];
-	  fileSystem->ReadFile(buffer, size);
-	  music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
-
-	  delete[] buffer;
-	  fileSystem->CloseFile();
-	}
+        music->player = new QMediaPlayer;
+        music->player->setVolume(100);
+        music->playlist = new QMediaPlaylist;
+        music->fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
+        music->playlist->addMedia(QUrl::fromLocalFile(music->fullpath.c_str()));
+        music->playlist->setCurrentIndex(0);
+    }
+#elif defined USE_PHONON
+    music = new JMusic();
+    if (music)
+    {
+        music->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0);
+        music->mMediaObject = new Phonon::MediaObject(0);
+        string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
+        music->mMediaObject->setCurrentSource(QString(fullpath.c_str()));
+        Phonon::Path mediapath = Phonon::createPath(music->mMediaObject, music->mOutput);
+        Q_ASSERT(mediapath.isValid());
+    }
+#elif (defined WITH_FMOD)
+    music = new JMusic();
+    if (music)
+    {
+        JFileSystem* fileSystem = JFileSystem::GetInstance();
+        if (fileSystem->OpenFile(fileName))
+        {
+            int size = fileSystem->GetFileSize();
+            char *buffer = new char[size];
+            fileSystem->ReadFile(buffer, size);
+            music->mTrack = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
+
+            delete[] buffer;
+            fileSystem->CloseFile();
+        }
     }
-  return music;
 #else
-  return NULL;
+    cerr << fileName << endl;
 #endif
+    return music;
 }
 
 
 void JSoundSystem::PlayMusic(JMusic *music, bool looping)
 {
-#ifdef USE_PHONON
-  if (music && music->mMediaObject && music->mOutput)
-  {
-    if(looping)
+#if (defined QT_CONFIG)  && (!defined USE_PHONON)
+    if(music && music->player && music->playlist)
     {
-      music->mMediaObject->connect(music->mMediaObject, SIGNAL(aboutToFinish()), music, SLOT(seekAtTheBegining()));
-    }
-    music->mOutput->setVolume((qreal)mVolume*0.01);
-    music->mMediaObject->play();
+        if(looping)
+            music->playlist->setPlaybackMode(QMediaPlaylist::Loop);
 
-  }
+        music->player->setPlaylist(music->playlist);
+        music->player->play();
+    }
+#elif USE_PHONON
+    if (music && music->mMediaObject && music->mOutput)
+    {
+        if(looping)
+        {
+            music->mMediaObject->connect(music->mMediaObject, SIGNAL(aboutToFinish()), music, SLOT(seekAtTheBegining()));
+        }
+        music->mOutput->setVolume((qreal)mVolume*0.01);
+        music->mMediaObject->play();
+
+    }
 #elif (defined WITH_FMOD)
-  if (music && music->mTrack)
+    if (music && music->mTrack)
     {
-      mChannel = FSOUND_PlaySound(mChannel, music->mTrack);
-      SetMusicVolume(mVolume);
+        mChannel = FSOUND_PlaySound(mChannel, music->mTrack);
+        SetMusicVolume(mVolume);
 
-      if (looping)
-	FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_NORMAL);
-      else
-	FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_OFF);
+        if (looping)
+            FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_NORMAL);
+        else
+            FSOUND_SetLoopMode(mChannel, FSOUND_LOOP_OFF);
     }
+#else
+    music = 0;
+    looping = false;
 #endif
 }
 
 
 void JSoundSystem::StopMusic(JMusic *music)
 {
-#ifdef USE_PHONON
+#if (defined QT_CONFIG) && (!defined USE_PHONON)
+    if (music && music->player && music->playlist)
+    {
+        music->player->stop();
+    }
+#elif defined USE_PHONON
   if (music && music->mMediaObject && music->mOutput)
   {
     music->mMediaObject->stop();
   }
 #elif (defined WITH_FMOD)
   FSOUND_StopSound(mChannel);
+#else
+    music = 0;
 #endif
 }
 
@@ -258,46 +298,61 @@ void JSoundSystem::SetSfxVolume(int volume){
 
 JSample *JSoundSystem::LoadSample(const char *fileName)
 {
-#if (defined USE_PHONON)
-  JSample* sample = new JSample();
-  if (sample)
-  {
-    sample->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0);
-    sample->mMediaObject = new Phonon::MediaObject(0);
-    string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
-    sample->mMediaObject->setCurrentSource(QString(fullpath.c_str()));
-    Phonon::Path mediapath = Phonon::createPath(sample->mMediaObject, sample->mOutput);
-    Q_ASSERT(mediapath.isValid());
-  }
-  return sample;
-#elif (defined WITH_FMOD)
-  JSample* sample = new JSample();
-  if (sample)
+    JSample* sample = NULL;
+#if (defined QT_CONFIG) && (!defined USE_PHONON)
+    sample = new JSample();
+    if (sample)
     {
-      JFileSystem* fileSystem = JFileSystem::GetInstance();
-      if (fileSystem->OpenFile(fileName))
-	{
-	  int size = fileSystem->GetFileSize();
-	  char *buffer = new char[size];
-	  fileSystem->ReadFile(buffer, size);
-	  sample->mSample = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
+        string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
+        sample->effect = new QMediaPlayer;
+        sample->effect->setMedia(QUrl::fromLocalFile(fullpath.c_str()));
+        sample->effect->setVolume(100);
+        sample->mSample = &(sample->effect);
+    }
+#elif (defined USE_PHONON)
+    sample = new JSample();
+    if (sample)
+    {
+        sample->mOutput = new Phonon::AudioOutput(Phonon::GameCategory, 0);
+        sample->mMediaObject = new Phonon::MediaObject(0);
+        string fullpath = JFileSystem::GetInstance()->GetResourceFile(fileName);
+        sample->mMediaObject->setCurrentSource(QString(fullpath.c_str()));
+        Phonon::Path mediapath = Phonon::createPath(sample->mMediaObject, sample->mOutput);
+        Q_ASSERT(mediapath.isValid());
+    }
+#elif (defined WITH_FMOD)
+    sample = new JSample();
+    if (sample)
+    {
+        JFileSystem* fileSystem = JFileSystem::GetInstance();
+        if (fileSystem->OpenFile(fileName))
+        {
+            int size = fileSystem->GetFileSize();
+            char *buffer = new char[size];
+            fileSystem->ReadFile(buffer, size);
+            sample->mSample = FSOUND_Sample_Load(FSOUND_UNMANAGED, buffer, FSOUND_LOADMEMORY, 0, size);
 
-	  delete[] buffer;
-	  fileSystem->CloseFile();
-	}else
-	sample->mSample = NULL;
+            delete[] buffer;
+            fileSystem->CloseFile();
+        }else
+            sample->mSample = NULL;
 
     }
-  return sample;
 #else
-  return NULL;
+    cerr << fileName << endl;
 #endif
+    return sample;
 }
 
 
 void JSoundSystem::PlaySample(JSample *sample)
 {
-#ifdef USE_PHONON
+#if (defined QT_CONFIG) && (!defined USE_PHONON)
+    if(sample)
+    {
+        sample->effect->play();
+    }
+#elif defined USE_PHONON
   if (sample && sample->mMediaObject && sample->mOutput)
   {
     sample->mOutput->setVolume((qreal)mSampleVolume*0.01);
@@ -308,6 +363,8 @@ void JSoundSystem::PlaySample(JSample *sample)
     int channel = FSOUND_PlaySound(FSOUND_FREE, sample->mSample);
     FSOUND_SetVolumeAbsolute(channel, static_cast<int>(mSampleVolume * 2.55));
   }
+#else
+    sample = 0;
 #endif
 }
 

JGE/src/pc/JSocket.cpp

@@ -7,6 +7,7 @@
 #include <winsock.h>
 #include <fcntl.h>
 #elif LINUX
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -16,11 +17,6 @@
 
 #include "../../include/JSocket.h"
 #include "../../include/DebugRoutines.h"
-//JSocket * JSocket::mInstance = NULL;
-
-//#define SERVER_PORT 20666
-#define SERVER_PORT 5001
-unsigned char ADRESSE_IP_SERVEUR [4] = {127,0,0,1};
 
 
 JSocket::JSocket(string ipAddr)
@@ -28,7 +24,7 @@ JSocket::JSocket(string ipAddr)
 	mfd(-1)
 {
 	int result;
-	struct hostent *hostentptr;
+	struct hostent *hostentptr = 0;
 #ifdef WIN32
 	SOCKADDR_IN Adresse_Socket_Server;
 	WORD wVersionRequested;
@@ -264,9 +260,17 @@ int JSocket::Read(char* buff, int size)
 #endif //WINDOWS
 			if(readbytes < 0)
 			{
-				DebugTrace("Error reading from socket\n");
+#ifdef WIN32
+				DebugTrace("Error reading from socket: " << WSAGetLastError());
+#endif //WINDOWS
+				Disconnect();
 				return -1;
 			}
+			else if(readbytes == 0)
+			{
+				Disconnect();
+				return 0;
+			}
 			else
 				return readbytes;
 		}
@@ -303,6 +307,7 @@ int JSocket::Write(char* buff, int size)
 		}
 		else if (result < 0)
 		{
+			Disconnect();
 			return -1;
 		}
 	}

JGE/src/vram.cpp

@@ -75,7 +75,7 @@ static int __largest_block = __MEM_BLOCKS;
 static int __mem_free = __MEM_BLOCKS;
 
 
-inline void* vrelptr( void *ptr )
+void* vrelptr( void *ptr )
 {
         return (void*)((unsigned int)ptr & ~__MEM_START);
 }

JGE/src/windows/JSfx.cpp

@@ -0,0 +1,182 @@
+#include <Windows.h>
+#include <Mmsystem.h>
+#include <mciapi.h>
+//these two headers are already included in the <Windows.h> header
+#pragma comment(lib, "Winmm.lib")
+
+#include "DebugRoutines.h"
+#include "../../include/JSoundSystem.h"
+#include "../../include/JFileSystem.h"
+
+//////////////////////////////////////////////////////////////////////////
+JMusic::JMusic()
+    :
+    mTrack(0)
+{
+}
+
+void JMusic::Update(){
+
+}
+
+int JMusic::getPlayTime(){
+  return 0;
+}
+
+JMusic::~JMusic()
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+JSample::JSample()
+{
+
+}
+
+JSample::~JSample()
+{
+}
+
+unsigned long JSample::fileSize()
+{
+  return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////
+JSoundSystem* JSoundSystem::mInstance = NULL;
+
+JSoundSystem* JSoundSystem::GetInstance()
+{
+  if (mInstance == NULL)
+    {
+      mInstance = new JSoundSystem();
+      mInstance->InitSoundSystem();
+    }
+  return mInstance;
+}
+
+
+void JSoundSystem::Destroy()
+{
+  if (mInstance)
+    {
+      mInstance->DestroySoundSystem();
+      delete mInstance;
+      mInstance = NULL;
+    }
+}
+
+
+JSoundSystem::JSoundSystem()
+{
+  mVolume = 0;
+  mSampleVolume = 0;
+}
+
+JSoundSystem::~JSoundSystem()
+{
+}
+
+void JSoundSystem::InitSoundSystem()
+{
+}
+
+
+void JSoundSystem::DestroySoundSystem()
+{
+}
+
+
+JMusic *JSoundSystem::LoadMusic(const char *fileName)
+{
+    JMusic* music = NULL;
+	music = new JMusic();
+    if (music)
+    {
+		music->filename = JFileSystem::GetInstance()->GetResourceFile(fileName);
+		std::string aString = "open \"" + music->filename + "\" type mpegvideo alias mp3";
+		mciSendString(aString.c_str(), NULL, 0, NULL);
+		music->mTrack = (void*)-1;
+    }
+
+	return music;
+}
+
+
+void JSoundSystem::PlayMusic(JMusic *music, bool looping)
+{
+    if (music && music->mTrack)
+    {
+		if(looping)
+			mciSendString("play mp3 repeat", NULL, 0, NULL);
+		else
+			mciSendString("play mp3", NULL, 0, NULL);
+    }
+}
+
+
+void JSoundSystem::StopMusic(JMusic *music)
+{
+    if (music && music->mTrack)
+    {
+		mciSendString("stop mp3", NULL, 0, NULL);
+    }
+}
+
+
+void JSoundSystem::PauseMusic(JMusic *music)
+{
+	if (music && music->mTrack)
+	{
+		mciSendString("pause mp3", NULL, 0, NULL);
+	}
+}
+
+
+void JSoundSystem::ResumeMusic(JMusic *music)
+{
+	if (music && music->mTrack)
+	{
+		mciSendString("resume mp3", NULL, 0, NULL);
+	}
+}
+
+
+void JSoundSystem::SetVolume(int volume)
+{
+  SetMusicVolume(volume);
+  SetSfxVolume(volume);
+}
+
+void JSoundSystem::SetMusicVolume(int volume)
+{
+  mVolume = volume;
+}
+
+void JSoundSystem::SetSfxVolume(int volume)
+{
+  mSampleVolume = volume;
+  SetMusicVolume(mVolume);
+}
+
+JSample *JSoundSystem::LoadSample(const char *fileName)
+{
+    JSample* sample = NULL;
+    sample = new JSample();
+    if (sample)
+    {
+		sample->filename = JFileSystem::GetInstance()->GetResourceFile(fileName);
+    }
+
+	return sample;
+}
+
+
+void JSoundSystem::PlaySample(JSample *sample)
+{
+    if(sample)
+    {
+		sndPlaySound(sample->filename.c_str(), SND_FILENAME | SND_ASYNC);
+    }
+}
+

README.md

@@ -0,0 +1,28 @@
+#Wagic the Homebrew
+
+
+[![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.org/WagicProject/wagic)
+[![Build status](https://ci.appveyor.com/api/projects/status/7j4fbr6m62aqej59/branch/master)](https://ci.appveyor.com/project/xawotihs/wagic/branch/master)
+[![Coverage Status](https://coveralls.io/repos/WagicProject/wagic/badge.png?branch=master)](https://coveralls.io/r/WagicProject/wagic?branch=master)
+
+## Description
+
+Wagic, the Homebrew, is a C++ game engine that allows to play card games against an AI on
+- Android (phones and tablets) 
+- iOS (iPhone/iPad)
+- Sony PSP
+- Windows desktops 
+- MacOS
+- Linux and derivated like Maemo or Meego 
+
+It is highly customizable and allows the player to tweak the rules / create their own cards, their own themes, etc... 
+
+
+Info, downloads, discussions and more at http://wololo.net/forum/index.php
+
+![alt text](http://wololo.net/wagic/wp-content/uploads/2009/10/shop.jpg "Screenshot")
+
+
+
+### Sample round play-through video
+[![IMAGE ALT TEXT HERE](http://img.youtube.com/vi/WUFSAPZuDIk/0.jpg)](http://www.youtube.com/watch?v=WUFSAPZuDIk)

adwhirl/AdWhirlSDK_iOS_3.1.1/AdNetworkLibs/README

@@ -1,2 +0,0 @@
-You can put ad network libraries in this directory. The sample .xcodeproj references to files here.
-DO NOT PUSH ANY AD NETWORK LIBRARIES TO GOOGLE CODE.

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/AdWhirlDelegateProtocol.h

@@ -1,344 +0,0 @@
-/*
-
- AdWhirlDelegateProtocol.h
-
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import <CoreLocation/CoreLocation.h>
-#import <UIKit/UIKit.h>
-
-@class AdWhirlView;
-
-@protocol AdWhirlDelegate<NSObject>
-
-@required
-
-- (NSString *)adWhirlApplicationKey;
-
-/**
- * The view controller with which the ad network will display a modal view
- * (web view, canvas), such as when the user clicks on the ad. You must
- * supply a view controller. You should return the root view controller
- * of your application, such as the root UINavigationController, or
- * any controllers that are pushed/added directly to the root view controller.
- * For example, if your app delegate has a pointer to the root view controller:
- *
- * return [(MyAppDelegate *)[[UIApplication sharedApplication] delegate] rootViewController]
- *
- * will suffice.
- */
-- (UIViewController *)viewControllerForPresentingModalView;
-
-@optional
-
-#pragma mark server endpoints
-/**
- * If you are running your own AdWhirl server instance, make sure you
- * implement the following to return the URL that points to the endpoints
- * on your server.
- */
-- (NSURL *)adWhirlConfigURL;
-- (NSURL *)adWhirlImpMetricURL;
-- (NSURL *)adWhirlClickMetricURL;
-- (NSURL *)adWhirlCustomAdURL;
-
-
-#pragma mark notifications
-/**
- * You can listen to callbacks from AdWhirl via these methods.  When AdWhirl is
- * notified that an ad request is fulfilled, it will notify you immediately.
- * Thus, when notified that an ad request succeeded, you can choose to add the
- * AdWhirlView object as a subview to your view.  This view contains the ad.
- * When you are notified that an ad request failed, you are also informed if the
- * AdWhirlView is fetching a backup ad.  The backup fetching order is specified
- * by you in adwhirl.com or your own server instance.  When all backup sources
- * are attempted and the last ad request still fails, the usingBackup parameter
- * will be set to NO.  You can use this notification to try again and perhaps
- * request another AdWhirlView via [AdWhirlView requestAdWhirlViewWithDelegate:]
- */
-- (void)adWhirlDidReceiveAd:(AdWhirlView *)adWhirlView;
-- (void)adWhirlDidFailToReceiveAd:(AdWhirlView *)adWhirlView usingBackup:(BOOL)yesOrNo;
-
-/**
- * You can get notified when the transition animation to a new ad is completed
- * so you can make necessary adjustments to the size of the adWhirlView and
- * surrounding views after the animation.
- */
-- (void)adWhirlDidAnimateToNewAdIn:(AdWhirlView *)adWhirlView;
-
-/**
- * This function is your integration point for Generic Notifications. You can
- * control when this notification occurs via the developers member section.  You
- * can allocate a percentage of your ad requests to initiate this callback.  When
- * you receive this notification, you can execute any code block that you own.
- * For example, you can replace the ad in AdWhirlView after getting this callback
- * by calling replaceBannerViewWith: . Note that the ad refresh cycle is still
- * alive, so your view could be replaced by other ads when it's time for an
- * ad refresh.
- */
-- (void)adWhirlReceivedRequestForDeveloperToFufill:(AdWhirlView *)adWhirlView;
-
-/**
- * In the event that ads are OFF, you can listen to this callback method to
- * determine that ads have been turned off.
- */
-- (void)adWhirlReceivedNotificationAdsAreOff:(AdWhirlView *)adWhirlView;
-
-/**
- * These notifications will let you know when a user is being shown a full screen
- * webview canvas with an ad because they tapped on an ad.  You should listen to
- * these notifications to determine when to pause/resume your game--if you're
- * building a game app.
- */
-- (void)adWhirlWillPresentFullScreenModal;
-- (void)adWhirlDidDismissFullScreenModal;
-
-/**
- * An ad request is a two step process: first the SDK must go to the AdWhirl
- * server to retrieve configuration information. Then, based on the configuration
- * information, it chooses an ad network and fetch an ad. The following call
- * is for users to get notified when the first step is complete. The
- * adWhirlView passed could be null if you had called the AdWhirlView class
- * method +startPreFetchingConfigurationDataWithDelegate .
- */
-- (void)adWhirlDidReceiveConfig:(AdWhirlView *)adWhirlView;
-
-
-#pragma mark behavior configurations
-
-/**
- * Request test ads for APIs that supports it. Make sure you turn it to OFF
- * or remove the function before you submit your app to the app store.
- */
-- (BOOL)adWhirlTestMode;
-
-/**
- * Returns the device's current orientation for ad networks that relys on
- * it. If you don't implement this function, [UIDevice currentDevice].orientation
- * is used to get the current orientation.
- */
-- (UIDeviceOrientation)adWhirlCurrentOrientation;
-
-#pragma mark appearance configurations
-- (UIColor *)adWhirlAdBackgroundColor;
-- (UIColor *)adWhirlTextColor;
-- (UIColor *)adWhirlSecondaryTextColor;
-- (UIColor *)backgroundColor DEPRECATED_ATTRIBUTE; // use the one with adWhirl prefix
-- (UIColor *)textColor DEPRECATED_ATTRIBUTE; // use the one with adWhirl prefix
-
-
-#pragma mark hard-coded application keys
-- (NSString *)admobPublisherID; // your Publisher ID from Admob.
-- (NSDictionary *)quattroWirelessDictionary;  // key-value pairs for the keys "publisherID" and "siteID" provided by Quattro Wireless.  Set NSString values for these two keys.
-- (NSString *)pinchApplicationKey; // your Application Code from Pinch Media.
-- (NSDictionary *)videoEggConfigDictionary;  // key-value pairs for the keys "publisher" and "area" information from Video Egg.  Set NSString values for these two keys.
-- (NSString *)millennialMediaApIDString;  // your ApID string from Millennial Media.
-- (NSString *)MdotMApplicationKey; // your Application Code from MdotM
-- (NSString *)googleAdSenseClientID; // your publisher ID from Google AdSense
-- (NSString *)zestADZClientID; // your clientID from ZestADZ
-- (NSString *)brightRollAppId; // your BrightRoll App ID
-- (NSString *)inMobiAppID; // your inMobi app ID
-- (NSString *)oneRiotAppID;
-- (NSDictionary *) nexageDictionary; // your nexage dcn and position
-
-
-#pragma mark demographic information optional delegate methods
-- (CLLocation *)locationInfo; // user's current location
-- (NSString *)postalCode; // user's postal code, e.g. "94401"
-- (NSString *)areaCode; // user's area code, e.g. "415"
-- (NSDate *)dateOfBirth; // user's date of birth
-- (NSString *)gender; // user's gender (e.g. @"m" or @"f")
-- (NSString *)keywords; // keywords the user has provided or that are contextually relevant, e.g. @"twitter client iPhone"
-- (NSString *)searchString; // a search string the user has provided, e.g. @"Jasmine Tea House San Francisco"
-- (NSUInteger)incomeLevel; // return actual annual income
-
-
-#pragma mark QuattroWireless-specific optional delegate methods
-/**
- * Return the ad type desired for Quattro
- * QWAdTypeBanner = 0,
- * QWAdTypeText=2,
- */
-- (NSUInteger)quattroWirelessAdType;
-
-/**
- * Return a value for the education level if you have access to this info.  This
- * information will be relayed to Quattro Wireless if provided.
- * QWEducationNoCollege = 0
- * QWEducationCollegeGraduate = 1
- * QWEducationGraduateSchool = 2
- * QWEducationUnknown = 3
- */
-- (NSUInteger)quattroWirelessEducationLevel;
-
-/**
- * Return a value for the ethnicity if you have access to this info.  This
- * information will be relayed to Quattro Wireless if provided.
- * QWEthnicGroupAfrican_American = 0
- * QWEthnicGroupAsian = 1
- * QWEthnicGroupHispanic = 2
- * QWEthnicGroupWhite = 3
- * QWEthnicGroupOther = 4
- */
-- (NSUInteger)quattroWirelessEthnicity;
-
-
-#pragma mark MillennialMedia-specific optional delegate methods
-/**
- * Return the ad type desired for Millennial Media, depending on your ad position
- * MMBannerAdTop = 1,
- * MMBannerAdBottom = 2,
- */
-- (NSUInteger)millennialMediaAdType;
-
-/**
- * Return a value for the education level if you have access to this info.  This
- * information will be relayed to Millennial Media if provided
- * MMEducationUnknown = 0,
- * MMEducationHishSchool = 1,
- * MMEducationSomeCollege = 2,
- * MMEducationInCollege = 3,
- * MMEducationBachelorsDegree = 4,
- * MMEducationMastersDegree = 5,
- * MMEducationPhD = 6
- */
-- (NSUInteger)millennialMediaEducationLevel;
-
-/**
- * Return a value for ethnicity if you have access to this info.  This
- * information will be relayed to Millennial Media if provided.
- * MMEthnicityUnknown = 0,
- * MMEthnicityAfricanAmerican = 1,
- * MMEthnicityAsian = 2,
- * MMEthnicityCaucasian = 3,
- * MMEthnicityHispanic = 4,
- * MMEthnicityNativeAmerican = 5,
- * MMEthnicityMixed = 6
- */
-- (NSUInteger)millennialMediaEthnicity;
-
-- (NSUInteger)millennialMediaAge DEPRECATED_ATTRIBUTE; // use dateOfBirth
-
-
-#pragma mark Jumptap-specific optional delegate methods
-/**
- * optional site and spot id as provided by Jumptap.
- */
-- (NSString *)jumptapSiteId;
-- (NSString *)jumptapSpotId;
-
-/**
- * Find a list of valid categories at https://support.jumptap.com/index.php/Valid_Categories
- */
-- (NSString *)jumptapCategory;
-
-/**
- * Whether adult content is allowed.
- * AdultContentAllowed = 0,
- * AdultContentNotAllowed = 1,
- * AdultContentOnly = 2
- */
-- (NSUInteger)jumptapAdultContent;
-
-/**
- * The transition to use when moving from, say, a banner to full-screen.
- * TransitionHorizontalSlide = 0,
- * TransitionVerticalSlide = 1,
- * TransitionCurl = 2,
- * TransitionFlip = 3
- */
-- (NSUInteger)jumptapTransitionType;
-
-
-#pragma mark Google AdSense-specific delegate methods
-/**
- These are *REQUIRED* for googleAdSense. If you don't implement these methods,
- your app will crash as the AdSense adapter looks for these methods.
- */
-- (NSString *)googleAdSenseCompanyName;
-- (NSString *)googleAdSenseAppName;
-- (NSString *)googleAdSenseApplicationAppleID;
-
-/**
- The following are optional and correspond to the optional kGADAdSense* ad attributes.
- For documentation, see GADAdSenseParameters.h .
- */
-- (NSString *)googleAdSenseKeywords;
-- (NSURL *)googleAdSenseAppWebContentURL;
-- (NSArray *)googleAdSenseChannelIDs;
-- (NSString *)googleAdSenseAdType;
-- (NSString *)googleAdSenseHostID;
-//- (UIColor *)googleAdSenseAdBackgroundColor; // implement adWhirlAdBackgroundColor or set in server
-- (UIColor *)googleAdSenseAdTopBackgroundColor;
-- (UIColor *)googleAdSenseAdBorderColor;
-- (UIColor *)googleAdSenseAdLinkColor;
-//- (UIColor *)googleAdSenseAdTextColor; // implement adWhirlTextColor or set in server
-- (UIColor *)googleAdSenseAdURLColor;
-- (UIColor *)googleAdSenseAlternateAdColor;
-- (NSURL *)googleAdSenseAlternateAdURL;
-- (NSNumber *)googleAdSenseAllowAdsafeMedium;
-
-
-#pragma mark InMobi-specific optional delegate methods
-/**
- * Education level for InMobi
- * Edu_None = 0
- * Edu_HighSchool = 1
- * Edu_SomeCollege = 2
- * Edu_InCollege = 3
- * Edu_BachelorsDegree = 4
- * Edu_MastersDegree = 5
- * Edu_DoctoralDegree = 6
- * Edu_Other = 7
- */
-- (NSUInteger)inMobiEducation;
-
-/**
- Eth_None = 0,
- Eth_Mixed = 1,
- Eth_Asian = 2,
- Eth_Black = 3,
- Eth_Hispanic = 4,
- Eth_NativeAmerican = 5,
- Eth_White = 6,
- Eth_Other = 7
- */
-- (NSUInteger)inMobiEthnicity;
-
-/**
- * See inMobi's documentation for valid values
- */
-- (NSString *)inMobiInterests;
-
-- (NSString *)iAdAdvertisingSection;
-
-- (NSDictionary *)inMobiParamsDictionary;
-
-#pragma mark OneRiot-specific optional delegate methods
-
-/** Returns an array of NSStrings containing all optional context parameters
- */
-- (NSArray *)oneRiotContextParameters;
-
-#pragma mark Nexage-specific optional delegate methods
--(NSString *)nexageCity;
--(NSString *)nexageDesignatedMarketArea;
--(NSString *)nexageCountry;
--(NSString *)nexageEthnicity;
--(NSString *)nexageMaritalStatus;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/AdWhirlView.h

@@ -1,231 +0,0 @@
-/*
-
- AdWhirlView.h
-
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import <UIKit/UIKit.h>
-#import "AdWhirlDelegateProtocol.h"
-#import "AWNetworkReachabilityWrapper.h"
-#import "AdWhirlConfig.h"
-
-#define kAdWhirlAppVer 310
-
-#define kAdWhirlViewWidth 320
-#define kAdWhirlViewHeight 50
-#define kAdWhirlViewDefaultSize \
-                        (CGSizeMake(kAdWhirlViewWidth, kAdWhirlViewHeight))
-#define kAdWhirlViewDefaultFrame \
-                        (CGRectMake(0,0,kAdWhirlViewWidth, kAdWhirlViewHeight))
-
-#define kAdWhirlDefaultConfigURL @"http://mob.adwhirl.com/getInfo.php"
-#define kAdWhirlDefaultImpMetricURL @"http://met.adwhirl.com/exmet.php"
-#define kAdWhirlDefaultClickMetricURL @"http://met.adwhirl.com/exclick.php"
-#define kAdWhirlDefaultCustomAdURL @"http://mob.adwhirl.com/custom.php"
-#define kAWMinimumTimeBetweenFreshAdRequests 4.9f
-#define kAdWhirlAdRequestTimeout 10
-
-
-@class AdWhirlAdNetworkConfig;
-@class AdWhirlAdNetworkAdapter;
-@class AdWhirlConfigStore;
-@class AWNetworkReachabilityWrapper;
-
-
-@interface AdWhirlView : UIView <AdWhirlConfigDelegate,
-                                 AWNetworkReachabilityDelegate> {
-  id<AdWhirlDelegate> delegate;
-  AdWhirlConfig *config;
-
-  NSMutableArray *prioritizedAdNetCfgs;
-  double totalPercent;
-
-  BOOL ignoreAutoRefreshTimer;
-  BOOL ignoreNewAdRequests;
-  BOOL appInactive;
-  BOOL showingModalView;
-
-  BOOL requesting;
-  AdWhirlAdNetworkAdapter *currAdapter;
-  AdWhirlAdNetworkAdapter *lastAdapter;
-  NSDate *lastRequestTime;
-  NSMutableDictionary *pendingAdapters;
-
-  NSTimer *refreshTimer;
-
-  // remember which adapter we last sent click stats for so we don't send twice
-  id lastNotifyAdapter;
-
-  NSError *lastError;
-
-  AdWhirlConfigStore *configStore;
-
-  AWNetworkReachabilityWrapper *rollOverReachability;
-
-  NSUInteger configFetchAttempts;
-
-  NSArray *testDarts;
-  NSUInteger testDartIndex;
-}
-
-/**
- * Call this method to get a view object that you can add to your own view. You
- * must also provide a delegate.  The delegate provides AdWhirl's application
- * key and can listen for important messages.  You can configure the view's
- * settings and specific ad network information on AdWhirl.com or your own
- * AdWhirl server instance.
- */
-+ (AdWhirlView *)requestAdWhirlViewWithDelegate:(id<AdWhirlDelegate>)delegate;
-
-/**
- * Starts pre-fetching ad network configurations from an AdWhirl server. If the
- * configuration has been fetched when you are ready to request an ad, you save
- * a round-trip to the network and hence your ad may show up faster. You
- * typically call this in the applicationDidFinishLaunching: method of your
- * app delegate. The request is non-blocking. You only need to call this
- * at most once per run of your application. Subsequent calls to this function
- * will be ignored.
- */
-+ (void)startPreFetchingConfigurationDataWithDelegate:(id<AdWhirlDelegate>)d;
-
-/**
- * Call this method to request a new configuration from the AdWhirl servers.
- * This can be useful to support iOS 4.0 backgrounding.
- */
-+ (void)updateAdWhirlConfigWithDelegate:(id<AdWhirlDelegate>)delegate;
-
-/**
- * Call this method to request a new configuration from the AdWhirl servers.
- */
-- (void)updateAdWhirlConfig;
-
-/**
- * Call this method to get another ad to display. You can also specify under
- * "app settings" on adwhirl.com to automatically get new ads periodically.
- */
-- (void)requestFreshAd;
-
-/**
- * Call this method if you prefer a rollover instead of a getNextAd call.  This
- * is offered primarily for developers who want to use generic notifications and
- * then execute a rollover when an ad network fails to serve an ad.
- */
-- (void)rollOver;
-
-/**
- * The delegate is informed asynchronously whether an ad succeeds or fails to
- * load. If you prefer to poll for this information, you can do so using this
- * method.
- *
- */
-- (BOOL)adExists;
-
-/**
- * Different ad networks may return different ad sizes. You may adjust the size
- * of the AdWhirlView and your UI to avoid unsightly borders or chopping off
- * pixels from ads. Call this method when you receive the adWhirlDidReceiveAd
- * delegate method to get the size of the underlying ad network ad.
- */
-- (CGSize)actualAdSize;
-
-/**
- * Some ad networks may offer different banner sizes for different orientations.
- * Call this function when the orientation of your UI changes so the underlying
- * ad may handle the orientation change properly. You may also want to
- * call the actualAdSize method right after calling this to get the size of
- * the ad after the orientation change.
- */
-- (void)rotateToOrientation:(UIInterfaceOrientation)orientation;
-
-/**
- * Call this method to get the name of the most recent ad network that an ad
- * request was made to.
- */
-- (NSString *)mostRecentNetworkName;
-
-/**
- * Call this method to ignore the automatic refresh timer.
- *
- * Note that the refresh timer is NOT invalidated when you call
- * ignoreAutoRefreshTimer.
- * This will simply ignore the refresh events that are called by the automatic
- * refresh timer (if the refresh timer is enabled via adwhirl.com).  So, for
- * example, let's say you have a refresh cycle of 60 seconds.  If you call
- * ignoreAutoRefreshTimer at 30 seconds, and call resumeRefreshTimer at 90 sec,
- * then the first refresh event is ignored, but the second refresh event at 120
- * sec will run.
- */
-- (void)ignoreAutoRefreshTimer;
-- (void)doNotIgnoreAutoRefreshTimer;
-- (BOOL)isIgnoringAutoRefreshTimer;
-
-/**
- * Call this method to ignore automatic refreshes AND manual refreshes entirely.
- *
- * This is provided for developers who asked to disable refreshing entirely,
- * whether automatic or manual.
- * If you call ignoreNewAdRequests, the AdWhirl will:
- * 1) Ignore any Automatic refresh events (via the refresh timer) AND
- * 2) Ignore any manual refresh calls (via requestFreshAd and rollOver)
- */
-- (void)ignoreNewAdRequests;
-- (void)doNotIgnoreNewAdRequests;
-- (BOOL)isIgnoringNewAdRequests;
-
-/**
- * Call this to replace the content of this AdWhirlView with the view.
- */
-- (void)replaceBannerViewWith:(UIView*)bannerView;
-
-/**
- * You can set the delegate to nil or another object.
- * Make sure you set the delegate to nil when you release an AdWhirlView
- * instance to avoid the AdWhirlView from calling to a non-existent delegate.
- * If you set the delegate to another object, note that if the new delegate
- * returns a different value for adWhirlApplicationKey, it will not overwrite
- * the application key provided by the delegate you supplied for
- * +requestAdWhirlViewWithDelegate .
- */
-@property (nonatomic, assign) IBOutlet id<AdWhirlDelegate> delegate;
-
-/**
- * Use this to retrieve more information after your delegate received a
- * adWhirlDidFailToReceiveAd message.
- */
-@property (nonatomic, readonly) NSError *lastError;
-
-
-#pragma mark For ad network adapters use only
-
-/**
- * Called by Adapters when there's a new ad view.
- */
-- (void)adapter:(AdWhirlAdNetworkAdapter *)adapter
-                                              didReceiveAdView:(UIView *)view;
-
-/**
- * Called by Adapters when ad view failed.
- */
-- (void)adapter:(AdWhirlAdNetworkAdapter *)adapter didFailAd:(NSError *)error;
-
-/**
- * Called by Adapters when the ad request is finished, but the ad view is
- * furnished elsewhere. e.g. Generic Notification
- */
-- (void)adapterDidFinishAdRequest:(AdWhirlAdNetworkAdapter *)adapter;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdNetworkAdapter.h

@@ -1,128 +0,0 @@
-/*
-
- AdWhirlAdNetworkAdapter.h
-
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlDelegateProtocol.h"
-#import "AdWhirlConfig.h"
-
-typedef enum {
-  AdWhirlAdNetworkTypeAdMob             = 1,
-  AdWhirlAdNetworkTypeJumpTap           = 2,
-  AdWhirlAdNetworkTypeVideoEgg          = 3,
-  AdWhirlAdNetworkTypeMedialets         = 4,
-  AdWhirlAdNetworkTypeLiveRail          = 5,
-  AdWhirlAdNetworkTypeMillennial        = 6,
-  AdWhirlAdNetworkTypeGreyStripe        = 7,
-  AdWhirlAdNetworkTypeQuattro           = 8,
-  AdWhirlAdNetworkTypeCustom            = 9,
-  AdWhirlAdNetworkTypeAdWhirl10         = 10,
-  AdWhirlAdNetworkTypeMobClix           = 11,
-  AdWhirlAdNetworkTypeMdotM             = 12,
-  AdWhirlAdNetworkTypeAdWhirl13         = 13,
-  AdWhirlAdNetworkTypeGoogleAdSense     = 14,
-  AdWhirlAdNetworkTypeGoogleDoubleClick = 15,
-  AdWhirlAdNetworkTypeGeneric           = 16,
-  AdWhirlAdNetworkTypeEvent             = 17,
-  AdWhirlAdNetworkTypeInMobi            = 18,
-  AdWhirlAdNetworkTypeIAd               = 19,
-  AdWhirlAdNetworkTypeZestADZ           = 20,
-  AdWhirlAdNetworkTypeBrightRoll        = 21,
-  AdWhirlAdNetworkTypeTapAd             = 22,
-  AdWhirlAdNetworkTypeOneRiot           = 23,
-  AdWhirlAdNetworkTypeNexage            = 24
-} AdWhirlAdNetworkType;
-
-@class AdWhirlView;
-@class AdWhirlConfig;
-@class AdWhirlAdNetworkConfig;
-
-@interface AdWhirlAdNetworkAdapter : NSObject {
-  id<AdWhirlDelegate> adWhirlDelegate;
-  AdWhirlView *adWhirlView;
-  AdWhirlConfig *adWhirlConfig;
-  AdWhirlAdNetworkConfig *networkConfig;
-  UIView *adNetworkView;
-}
-
-/**
- * Subclasses must implement +networkType to return an AdWhirlAdNetworkType enum.
- */
-//+ (AdWhirlAdNetworkType)networkType;
-
-/**
- * Subclasses must add itself to the AdWhirlAdNetworkRegistry. One way
- * to do so is to implement the +load function and register there.
- */
-//+ (void)load;
-
-/**
- * Default initializer. Subclasses do not need to override this method unless
- * they need to perform additional initialization. In which case, this
- * method must be called via the super keyword.
- */
-- (id)initWithAdWhirlDelegate:(id<AdWhirlDelegate>)delegate
-                         view:(AdWhirlView *)view
-                       config:(AdWhirlConfig *)config
-                networkConfig:(AdWhirlAdNetworkConfig *)netConf;
-
-/**
- * Ask the adapter to get an ad. This must be implemented by subclasses.
- */
-- (void)getAd;
-
-/**
- * When called, the adapter must remove itself as a delegate or notification
- * observer from the underlying ad network SDK. Subclasses must implement this
- * method, even if the underlying SDK doesn't have a way of removing delegate
- * (in which case, you should contact the ad network). Note that this method
- * will be called in dealloc at AdWhirlAdNetworkAdapter, before adNetworkView
- * is released. Care must be taken if you also keep a reference of your ad view
- * in a separate instance variable, as you may have released that variable
- * before this gets called in AdWhirlAdNetworkAdapter's dealloc. Use
- * adNetworkView, defined in this class, instead of your own instance variable.
- * This function should also be idempotent, i.e. get called multiple times and
- * not crash.
- */
-- (void)stopBeingDelegate;
-
-/**
- * Subclasses return YES to ask AdWhirlView to send metric requests to the
- * AdWhirl server for ad impressions. Default is YES.
- */
-- (BOOL)shouldSendExMetric;
-
-/**
- * Tell the adapter that the interface orientation changed or is about to change
- */
-- (void)rotateToOrientation:(UIInterfaceOrientation)orientation;
-
-/**
- * Some ad transition types may cause issues with particular ad networks. The
- * adapter should know whether the given animation type is OK. Defaults to
- * YES.
- */
-- (BOOL)isBannerAnimationOK:(AWBannerAnimationType)animType;
-
-@property (nonatomic,assign) id<AdWhirlDelegate> adWhirlDelegate;
-@property (nonatomic,assign) AdWhirlView *adWhirlView;
-@property (nonatomic,retain) AdWhirlConfig *adWhirlConfig;
-@property (nonatomic,retain) AdWhirlAdNetworkConfig *networkConfig;
-@property (nonatomic,retain) UIView *adNetworkView;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterBrightRoll.h

@@ -1,36 +0,0 @@
-/*
- AdWhirlAdapterBrightRoll.h
-
- Copyright 2010 BrightRoll, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "BRBannerAd.h"
-#import "BRBannerAdDelegate.h"
-#import "BRFullScreenAd.h"
-#import "BRFullScreenAdDelegate.h"
-
-@interface AdWhirlAdapterBrightRoll : AdWhirlAdNetworkAdapter <BRBannerAdDelegate, BRFullScreenAdDelegate>
-{
-  BRBannerAd *brBannerAd;
-}
-
-@property (nonatomic, retain) BRBannerAd *brBannerAd;
-
-+ (AdWhirlAdNetworkType)networkType;
-- (void)brBannerAdFetched:(BRBannerAd *)brBannerAd;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterBrightRoll.m

@@ -1,137 +0,0 @@
-/*
-
- AdWhirlAdapterBrightRoll.m
-
- Copyright 2009 BrightRoll, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdapterBrightRoll.h"
-#import "AdWhirlAdNetworkAdapter.h"
-#import "AdWhirlAdNetworkRegistry.h"
-#import "AdWhirlView.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkConfig.h"
-
-@implementation AdWhirlAdapterBrightRoll
-
-@synthesize brBannerAd;
-
-+ (AdWhirlAdNetworkType)networkType
-{
-  return AdWhirlAdNetworkTypeBrightRoll;
-}
-
-+ (void)load
-{
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-- (void)stopObserving
-{
-  [[NSNotificationCenter defaultCenter]
-    removeObserver:self
-    name:@"AdWhirlViewWillAnimateToNewAd"
-    object:self.adWhirlView];
-}
-
-- (void)stopBeingDelegate
-{
-  [self stopObserving];
-  self.brBannerAd.delegate = nil;
-  self.brBannerAd = nil;
-}
-
-- (void)getAd
-{
-  self.brBannerAd = [BRBannerAd fetchWithDelegate:self];
-}
-
-#pragma mark BRBannerAdDelegate required methods
-
-- (NSString *)brBannerAdAppId:(BRBannerAd *)theBrBannerAd
-{
-  if ([adWhirlDelegate respondsToSelector:@selector(brightRollAppId)])
-  {
-    return [adWhirlDelegate brightRollAppId];
-  }
-  return networkConfig.pubId;
-}
-
-- (void)brBannerAdFetched:(BRBannerAd *)theBrBannerAd
-{
-  [[NSNotificationCenter defaultCenter]
-   addObserver:self
-   selector:@selector(adWhirlWillAnimateToNewAdIn:)
-   name:@"AdWhirlViewWillAnimateToNewAd"
-   object:self.adWhirlView];
-
-  brBannerAd.fullScreenAd.delegate = self;
-  self.adNetworkView = brBannerAd.view;
-  [self.adWhirlView adapter:self didReceiveAdView:brBannerAd.view];
-}
-
-- (void)brBannerAdFetchFailed:(BRBannerAd *)bannerAd
-{
-  [adWhirlView
-    adapter:self
-    didFailAd:[NSError
-           errorWithDomain:@"com.brightroll.BrightRoll_iPhone_SDK"
-           code:404
-           userInfo:[NSDictionary dictionary]]];
-}
-
-- (void)brBannerAdWillShowFullScreenAd:(BRBannerAd *)bannerAd
-{
-  [self helperNotifyDelegateOfFullScreenModal];
-}
-
-#pragma mark AdWhirlView notification methods
-
-- (void)adWhirlWillAnimateToNewAdIn:(NSNotification *)notification
-{
-  if ([self.adWhirlView performSelector:@selector(currAdapter)] == self)
-  {
-    [self stopObserving];
-    [self helperNotifyDelegateOfFullScreenModal];
-    [brBannerAd.fullScreenAd show];
-  }
-}
-
-#pragma mark BRFullScreenAdDelegate required methods
-
-- (UIViewController *)brFullScreenAdControllerParent
-{
-  return [self.adWhirlDelegate viewControllerForPresentingModalView];
-}
-
-- (void)brFullScreenAdDismissed:(BRFullScreenAd *)brFullScreenAd
-{
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-- (NSString *)brightRollAppId
-{
-  NSString *appId = [self.networkConfig.credentials objectForKey:@"pubid"];
-  
-  if (!appId)
-  {
-    appId = [self.adWhirlDelegate brightRollAppId];
-  }
-  
-  return appId;
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterGoogleAdMobAds.h

@@ -1,32 +0,0 @@
-/*
-
- AdWhirlAdapterGoogleAdMobAds.h
- Copyright 2011 Google, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "GADBannerViewDelegate.h"
-
-@interface AdWhirlAdapterGoogleAdMobAds : AdWhirlAdNetworkAdapter
-    <GADBannerViewDelegate> {
-}
-
-- (SEL)delegatePublisherIdSelector;
-- (NSString *)hexStringFromUIColor:(UIColor *)color;
-+ (AdWhirlAdNetworkType)networkType;
-- (NSString *)publisherId;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterGoogleAdMobAds.m

@@ -1,199 +0,0 @@
-/*
-
- AdWhirlAdapterGoogleAdMobAds.m
- Copyright 2011 Google, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdapterGoogleAdMobAds.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlView.h"
-#import "GADBannerView.h"
-#import "AdWhirlLog.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkRegistry.h"
-
-@implementation AdWhirlAdapterGoogleAdMobAds
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeAdMob;
-}
-
-// converts UIColor to hex string, ignoring alpha.
-- (NSString *)hexStringFromUIColor:(UIColor *)color {
-  CGColorSpaceModel colorSpaceModel =
-      CGColorSpaceGetModel(CGColorGetColorSpace(color.CGColor));
-  if (colorSpaceModel == kCGColorSpaceModelRGB
-      || colorSpaceModel == kCGColorSpaceModelMonochrome) {
-    const CGFloat *colors = CGColorGetComponents(color.CGColor);
-    CGFloat red = 0.0, green = 0.0, blue = 0.0;
-    if (colorSpaceModel == kCGColorSpaceModelRGB) {
-      red = colors[0];
-      green = colors[1];
-      blue = colors[2];
-      // we ignore alpha here.
-    } else if (colorSpaceModel == kCGColorSpaceModelMonochrome) {
-      red = green = blue = colors[0];
-    }
-    return [NSString stringWithFormat:@"%02X%02X%02X",
-                (int)(red * 255), (int)(green * 255), (int)(blue * 255)];
-  }
-  return nil;
-}
-
-- (NSObject *)delegateValueForSelector:(SEL)selector {
-  return ([adWhirlDelegate respondsToSelector:selector]) ?
-      [adWhirlDelegate performSelector:selector] : nil;
-}
-
-- (void)getAd {
-  GADRequest *request = [GADRequest request];
-  NSObject *value;
-
-  NSMutableDictionary *additional = [NSMutableDictionary dictionary];
-  if ([adWhirlDelegate respondsToSelector:@selector(adWhirlTestMode)]
-      && [adWhirlDelegate adWhirlTestMode]) {
-    [additional setObject:@"on" forKey:@"adtest"];
-  }
-
-  if ((value = [self delegateValueForSelector:
-                      @selector(adWhirlAdBackgroundColor)])) {
-    [additional setObject:[self hexStringFromUIColor:(UIColor *)value]
-                  forKey:@"color_bg"];
-  }
-
-  if ((value = [self delegateValueForSelector:
-                      @selector(adWhirlAdBackgroundColor)])) {
-    [additional setObject:[self hexStringFromUIColor:(UIColor *)value]
-                   forKey:@"color_text"];
-  }
-
-  // deliberately don't allow other color specifications.
-
-  if ([additional count] > 0) {
-    request.additionalParameters = additional;
-  }
-
-  CLLocation *location =
-      (CLLocation *)[self delegateValueForSelector:@selector(locationInfo)];
-
-  if ((adWhirlConfig.locationOn) && (location)) {
-    [request setLocationWithLatitude:location.coordinate.latitude
-                           longitude:location.coordinate.longitude
-                            accuracy:location.horizontalAccuracy];
-  }
-
-  NSString *string =
-      (NSString *)[self delegateValueForSelector:@selector(gender)];
-
-  if ([string isEqualToString:@"m"]) {
-    request.gender = kGADGenderMale;
-  } else if ([string isEqualToString:@"f"]) {
-    request.gender = kGADGenderFemale;
-  } else {
-    request.gender = kGADGenderUnknown;
-  }
-
-  if ((value = [self delegateValueForSelector:@selector(dateOfBirth)])) {
-    request.birthday = (NSDate *)value;
-  }
-
-  if ((value = [self delegateValueForSelector:@selector(keywords)])) {
-    NSArray *keywordArray =
-        [(NSString *)value componentsSeparatedByString:@" "];
-    request.keywords = [NSMutableArray arrayWithArray:keywordArray];
-  }
-
-  // Set the frame for this view to match the bounds of the parent adWhirlView.
-  GADBannerView *view =
-      [[GADBannerView alloc] initWithFrame:adWhirlView.bounds];
-
-  view.adUnitID = [self publisherId];
-  view.delegate = self;
-  view.rootViewController =
-      [adWhirlDelegate viewControllerForPresentingModalView];
-
-  self.adNetworkView = [view autorelease];
-
-  [view loadRequest:request];
-}
-
-- (void)stopBeingDelegate {
-  if (self.adNetworkView != nil
-      && [self.adNetworkView respondsToSelector:@selector(setDelegate:)]) {
-    [self.adNetworkView performSelector:@selector(setDelegate:)
-         withObject:nil];
-  }
-}
-
-#pragma mark Ad Request Lifecycle Notifications
-
-// Sent when an ad request loaded an ad.  This is a good opportunity to add
-// this view to the hierarchy if it has not yet been added.
-- (void)adViewDidReceiveAd:(GADBannerView *)adView {
-  [adWhirlView adapter:self didReceiveAdView:adView];
-}
-
-// Sent when an ad request failed.  Normally this is because no network
-// connection was available or no ads were available (i.e. no fill).
-- (void)adView:(GADBannerView *)adView
-    didFailToReceiveAdWithError:(GADRequestError *)error {
-  [adWhirlView adapter:self didFailAd:error];
-}
-
-#pragma mark Click-Time Lifecycle Notifications
-
-// Sent just before presenting the user a full screen view, such as a browser,
-// in response to clicking on an ad.  Use this opportunity to stop animations,
-// time sensitive interactions, etc.
-//
-// Normally the user looks at the ad, dismisses it, and control returns to your
-// application by calling adViewDidDismissScreen:.  However if the user hits
-// the Home button or clicks on an App Store link your application will end.
-// On iOS 4.0+ the next method called will be applicationWillResignActive: of
-// your UIViewController (UIApplicationWillResignActiveNotification).
-// Immediately after that adViewWillLeaveApplication: is called.
-- (void)adViewWillPresentScreen:(GADBannerView *)adView {
-  [self helperNotifyDelegateOfFullScreenModal];
-}
-
-// Sent just after dismissing a full screen view.  Use this opportunity to
-// restart anything you may have stopped as part of adViewWillPresentScreen:.
-- (void)adViewDidDismissScreen:(GADBannerView *)adView {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-#pragma mark parameter gathering methods
-
-- (SEL)delegatePublisherIdSelector {
-  return @selector(admobPublisherID);
-}
-
-- (NSString *)publisherId {
-  SEL delegateSelector = [self delegatePublisherIdSelector];
-
-  if ((delegateSelector) &&
-      ([adWhirlDelegate respondsToSelector:delegateSelector])) {
-    return [adWhirlDelegate performSelector:delegateSelector];
-  }
-
-  return networkConfig.pubId;
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterGoogleAdSense.h

@@ -1,42 +0,0 @@
-/*
-
- AdWhirlAdapterGoogleAdSense.h
- 
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
-*/
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "GADAdViewController.h"
-#import "GADAdSenseParameters.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlAdNetworkRegistry.h"
-#import "AdWhirlView.h"
-
-@interface AdWhirlAdapterGoogleAdSense : AdWhirlAdNetworkAdapter <GADAdViewControllerDelegate> {
-	GADAdViewController *adViewController;
-}
-
-@property (retain) GADAdViewController *adViewController;
-
-+ (NSInteger)networkType;
-
-- (NSString *)publisherId;
-- (NSString *)companyName;
-- (NSString *)appName;
-- (NSString *)applicationAppleID;
-- (NSNumber *)testMode;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterGoogleAdSense.m

@@ -1,189 +0,0 @@
-/*
-
- AdWhirlAdapterGoogleAdSense.m
-
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdapterGoogleAdSense.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlConfig.h"
-#import "AdWhirlLog.h"
-
-static NSDictionary *GASParamNameToSel;
-
-@implementation AdWhirlAdapterGoogleAdSense
-
-@synthesize adViewController;
-
-+ (NSInteger)networkType {
-  return AdWhirlAdNetworkTypeGoogleAdSense;
-}
-
-+ (void)load {
-	[[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-  GASParamNameToSel = [[NSDictionary alloc] initWithObjectsAndKeys:
-                     @"googleAdSenseKeywords", kGADAdSenseKeywords,
-                     @"googleAdSenseAppWebContentURL", kGADAdSenseAppWebContentURL,
-                     @"googleAdSenseChannelIDs", kGADAdSenseChannelIDs,
-                     @"googleAdSenseAdType", kGADAdSenseAdType,
-                     @"googleAdSenseHostID", kGADAdSenseHostID,
-                     @"adWhirlAdBackgroundColor", kGADAdSenseAdBackgroundColor,
-                     @"googleAdSenseAdTopBackgroundColor", kGADAdSenseAdTopBackgroundColor,
-                     @"googleAdSenseAdBorderColor", kGADAdSenseAdBorderColor,
-                     @"googleAdSenseAdLinkColor", kGADAdSenseAdLinkColor,
-                     @"adWhirlTextColor", kGADAdSenseAdTextColor,
-                     @"googleAdSenseAdURLColor", kGADAdSenseAdURLColor,
-                     @"googleAdSenseAlternateAdColor", kGADAdSenseAlternateAdColor,
-                     @"googleAdSenseAlternateAdURL", kGADAdSenseAlternateAdURL,
-                     @"googleAdSenseAllowAdsafeMedium", kGADAdSenseAllowAdsafeMedium,
-                     nil];
-}
-
-- (id)initWithAdWhirlDelegate:(id<AdWhirlDelegate>)delegate
-                         view:(AdWhirlView *)view
-                       config:(AdWhirlConfig *)config
-                networkConfig:(AdWhirlAdNetworkConfig *)netConf {
-  self = [super initWithAdWhirlDelegate:delegate
-                                   view:view
-                                 config:config
-                          networkConfig:netConf];
-  if (self != nil) {
-    // Check that the required methods are implemented.
-    if (![delegate respondsToSelector:@selector(googleAdSenseCompanyName)]) {
-      [NSException raise:NSInvalidArgumentException format:
-       @"You must implement googleAdSenseCompanyName in your AdwhirlDelegate in order to use Google AdSense"];
-    }
-    if (![delegate respondsToSelector:@selector(googleAdSenseAppName)]) {
-      [NSException raise:NSInvalidArgumentException format:
-       @"You must implement googleAdSenseAppName in your AdwhirlDelegate in order to use Google AdSense"];
-    }
-    if (![delegate respondsToSelector:@selector(googleAdSenseApplicationAppleID)]) {
-      [NSException raise:NSInvalidArgumentException format:
-       @"You must implement googleAdSenseApplicationAppleID in your AdwhirlDelegate in order to use Google AdSense"];
-    }
-  }
-  return self;
-}
-
-- (void)getAd {
-  adViewController = [[GADAdViewController alloc] initWithDelegate:self];
-
-	NSMutableDictionary *attributes = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                                     [self publisherId], kGADAdSenseClientID,
-                                     [self companyName], kGADAdSenseCompanyName,
-                                     [self appName], kGADAdSenseAppName,
-                                     [self applicationAppleID], kGADAdSenseApplicationAppleID,
-                                     [self testMode], kGADAdSenseIsTestAdRequest,
-                                     nil];
-
-  // optional params
-  for (NSString *paramName in GASParamNameToSel) {
-    SEL sel = NSSelectorFromString((NSString *)[GASParamNameToSel objectForKey:paramName]);
-    if ([adWhirlDelegate respondsToSelector:sel]) {
-      NSObject *val = [adWhirlDelegate performSelector:sel];
-      if (val != nil) {
-        [attributes setObject:val forKey:paramName];
-      }
-    }
-  }
-
-  AWLogDebug(@"Google AdSense attributes: %@", attributes);
-	// load the ad
-	adViewController.adSize = kGADAdSize320x50;
-	[adViewController loadGoogleAd:attributes];
-  adViewController.view.frame = kAdWhirlViewDefaultFrame;
-	self.adNetworkView = adViewController.view;
-}
-
-- (void)stopBeingDelegate {
-  if (adViewController != nil) {
-    adViewController.delegate = nil;
-  }
-}
-
-- (void)dealloc {
-  // need to call here cos adViewController will be nil when super dealloc runs
-  [self stopBeingDelegate];
-  [adViewController release], adViewController = nil;
-	[super dealloc];
-}
-
-#pragma mark parameter gathering methods
-
-- (NSString *)publisherId {
-	if ([adWhirlDelegate respondsToSelector:@selector(googleAdSenseClientID)]) {
-		return [adWhirlDelegate googleAdSenseClientID];
-	}
-
-	return networkConfig.pubId;
-}
-
-- (NSString *)companyName {
-	return [adWhirlDelegate googleAdSenseCompanyName];
-}
-
-- (NSString *)appName {
-	return [adWhirlDelegate googleAdSenseAppName];
-}
-
-- (NSString *)applicationAppleID {
-  return [adWhirlDelegate googleAdSenseApplicationAppleID];
-}
-
-- (NSNumber *)testMode {
-  if ([adWhirlDelegate respondsToSelector:@selector(adWhirlTestMode)]
-      && [adWhirlDelegate adWhirlTestMode]) {
-    return [NSNumber numberWithInt:1];
-  }
-  return [NSNumber numberWithInt:0];
-}
-
-#pragma mark GADAdViewControllerDelegate required methods
-
-- (UIViewController *)viewControllerForModalPresentation:(GADAdViewController *)adController {
-	return [adWhirlDelegate viewControllerForPresentingModalView];
-}
-
-#pragma mark GADAdViewControllerDelegate notification methods
-
-- (void)loadSucceeded:(GADAdViewController *)adController withResults:(NSDictionary *)results {
-	[adWhirlView adapter:self didReceiveAdView:[adController view]];
-}
-
-- (void)loadFailed:(GADAdViewController *)adController withError:(NSError *) error {
-	[adWhirlView adapter:self didFailAd:error];
-}
-
-- (GADAdClickAction)adControllerActionModelForAdClick:(GADAdViewController *)adController {
-  [self helperNotifyDelegateOfFullScreenModal];
-	return GAD_ACTION_DISPLAY_INTERNAL_WEBSITE_VIEW; // full screen web view
-}
-
-- (void)adControllerDidCloseWebsiteView:(GADAdViewController *)adController {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-- (void)adControllerDidExpandAd:(GADAdViewController *)controller {
-  [self helperNotifyDelegateOfFullScreenModal];
-}
-
-- (void)adControllerDidCollapseAd:(GADAdViewController *)controller {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterGreystripe.h

@@ -1,49 +0,0 @@
-/*
- 
- AdWhirlAdapterGreystripe.m
- 
- Copyright 2010 Greystripe, Inc.
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
- */
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "GreystripeDelegate.h"
-
-/**
- * Banner slot name used to identify the banner ad slot within the Greystripe 
- * SDK.
- */
-extern NSString * const kGSBannerSlotName;
-
-/**
- * Full-screen slot name used to identify the full-screen ad slot within the
- * Greystripe SDK. Use this slot name to display full-screen ads as follows:
- *
- * [GSAdEngine displayFullScreenAdForSlotNamed:kGSFullScreenSlotName];
- * 
- * If you need to check whether an ad is available for this slot, simply use:
- * 
- * [GSAdEngine isAdReadyForSlotNamed:kGSFullScreenSlotName];
- */
-extern NSString * const kGSFullScreenSlotName;
-
-@class GSAdView;
-
-@interface AdWhirlAdapterGreystripe : AdWhirlAdNetworkAdapter <GreystripeDelegate> {
-  UIView *innerContainer;
-  UIView *outerContainer;
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterGreystripe.m

@@ -1,191 +0,0 @@
-/*
-
- AdWhirlAdapterGreystripe.m
-
- Copyright 2010 Greystripe, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdapterGreystripe.h"
-
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlAdNetworkRegistry.h"
-#import "AdWhirlLog.h"
-#import "AdWhirlView.h"
-#import "GSAdView.h"
-#import "GSAdEngine.h"
-
-// constants
-NSString * const kGSBannerSlotName = @"gsBanner";
-NSString * const kGSFullScreenSlotName = @"gsFullScreen";
-
-// static globals
-static BOOL g_didStartUpGreystripe;
-static NSTimeInterval g_lastAdReadyTime;
-
-@interface AdWhirlAdapterGreystripe ()
-- (void)bannerAdReady;
-@end
-
-@implementation AdWhirlAdapterGreystripe
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeGreyStripe;
-}
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-/**
- * Initialize the Greystripe adapter. The GSAdEngine will be started up the
- * first time this method is called, using the ID provided by the AdWhirl
- * server. Two slots will be registered with the GSAdEngine: one banner and one
- * full-screen. See the note in AdWhirlAdapterGreystripe.h on how to make use
- * of the full-screen slot.
- */
-- (id)initWithAdWhirlDelegate:(id<AdWhirlDelegate>)delegate
-                         view:(AdWhirlView *)view
-                       config:(AdWhirlConfig *)config
-                networkConfig:(AdWhirlAdNetworkConfig *)netConf {
-  if(self = [super initWithAdWhirlDelegate:delegate view:view config:config networkConfig:netConf]) {
-    if(!g_didStartUpGreystripe) {
-      @try {
-        GSAdSlotDescription * bannerSlot = [GSAdSlotDescription descriptionWithSize:kGSAdSizeBanner name:kGSBannerSlotName];
-        GSAdSlotDescription * fullScreenSlot = [GSAdSlotDescription descriptionWithSize:kGSAdSizeIPhoneFullScreen name:kGSFullScreenSlotName];
-        [GSAdEngine startupWithAppID:netConf.pubId adSlotDescriptions:[NSArray arrayWithObjects:bannerSlot,fullScreenSlot, nil]];
-        g_didStartUpGreystripe = YES;
-      }
-      @catch (NSException *e) {
-        // This exception is thrown when Greystripe is initialized twice. We
-        // ignore it because if the host app is using Greystripe directly for
-        // full-screen ads, it may have already initialized Greystripe before
-        // AdWhirl tried to do the same.
-        if([e.name isEqualToString:NSInternalInconsistencyException]){
-          g_didStartUpGreystripe = YES;
-        }
-        else {
-          @throw e;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-
-/**
- * Fetch a banner ad from Greystripe. This method only fetches banners as all
- * full-screen ad fetching is performed implicitly by the GSAdEngine.
- */
-- (void)getAd {
-  GSAdView *gsAdView = [GSAdView adViewForSlotNamed:kGSBannerSlotName delegate:self];
-
-  // Use default frame, slightly bigger, to be the parent view of gsAdView, so
-  // when the GSAdView finds its containing view it stops at the inner Container
-  // and will set the alpha of innerContainer, not the AdWhirlView
-  innerContainer = [[UIView alloc] initWithFrame:kAdWhirlViewDefaultFrame];
-  innerContainer.backgroundColor = [UIColor clearColor];
-  [innerContainer addSubview:gsAdView];
-
-  // Set the outer container to be the size of the gsAdView so there are no unsightly
-  // borders around the ad
-  outerContainer = [[UIView alloc] initWithFrame:gsAdView.frame];
-  outerContainer.backgroundColor = [UIColor clearColor];
-  [outerContainer addSubview:innerContainer];
-  self.adNetworkView = outerContainer;
-
-  NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
-  NSTimeInterval delta = now - g_lastAdReadyTime;
-  if(delta > kGSMinimumRefreshInterval) {
-    // For the initial ad display we will get an ad ready notification
-    // automatically because the ad is automatically rendered
-    // regardless of its refresh interval (0 here). For all other
-    // displays we must force it.
-    if(g_lastAdReadyTime > 0) {
-      if([GSAdEngine isNextAdDownloadedForSlotNamed:kGSBannerSlotName]) {
-        [gsAdView refresh];
-        [self bannerAdReady];
-      }
-      else {
-        AWLogDebug(@"Failing Greystripe banner ad request because the next "\
-                   "banner ad has not yet been downloaded.");
-        [adWhirlView adapter:self didFailAd:nil];
-      }
-    }
-  }
-  else {
-    AWLogDebug(@"Failing Greystripe ad request because Greystripe's "
-               "minimum refresh interval of %f has not elapsed since the "\
-               "previous banner display.", kGSMinimumRefreshInterval);
-    [adWhirlView adapter:self didFailAd:nil];
-  }
-}
-
-/**
- * Stop being the delegate for banner ads. In order to change the delegate for
- * full-screen Greystripe ads, see GSAdEngine's 
- * setFullScreenDelegate:forSlotNamed: method.
- */
-- (void)stopBeingDelegate {
-  [GSAdView adViewForSlotNamed:kGSBannerSlotName delegate:nil];
-}
-
-- (void)dealloc {
-  [innerContainer release];
-  [outerContainer release];
-  [super dealloc];
-}
-
-#pragma mark -
-#pragma mark GreystripeDelegate notification methods
-
-/**
- * Delegate notification received when Greystripe has a banner ad ready.
- */
-- (void)greystripeAdReadyForSlotNamed:(NSString *)a_name {
-  if ([a_name isEqualToString:kGSBannerSlotName] && g_lastAdReadyTime == 0) {
-    // Only forward on this notification for the initial notification as
-    // all other notifications will be sent explicitly after checking
-    // ad readiness (see getAd).
-    [self bannerAdReady];
-  }
-}
-
-- (void)greystripeFullScreenDisplayWillOpen {
-  [self helperNotifyDelegateOfFullScreenModal];
-}
-
-- (void)greystripeFullScreenDisplayWillClose {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-#pragma mark -
-#pragma mark Internal methods
-
-/**
- * Notify the host app that Greystripe has received an ad. This only applies
- * banner ads that the Greystripe SDK has fetched, as readiness of full-screen
- * ads can be always be checked directly via
- * [GSAdEngine isAdReadyForSlotNamed:kGSFullScreenSlotName].
- */
-- (void)bannerAdReady {
-  AWLogDebug(@"Greystripe received banner ad.");
-  g_lastAdReadyTime = [[NSDate date] timeIntervalSince1970];
-  [adWhirlView adapter:self didReceiveAdView:self.adNetworkView];
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterIAd.h

@@ -1,31 +0,0 @@
-/*
-
- AdWhirlAdapterIAd.h
-
- Copyright 2010 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import <iAd/ADBannerView.h>
-
-@interface AdWhirlAdapterIAd : AdWhirlAdNetworkAdapter <ADBannerViewDelegate> {
-  NSString *kADBannerContentSizeIdentifierPortrait;
-  NSString *kADBannerContentSizeIdentifierLandscape;
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterIAd.m

@@ -1,135 +0,0 @@
-/*
-
- AdWhirlAdapterIAd.m
-
- Copyright 2010 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-
-#import "AdWhirlAdapterIAd.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlView.h"
-#import "AdWhirlLog.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkRegistry.h"
-
-@implementation AdWhirlAdapterIAd
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeIAd;
-}
-
-+ (void)load {
-  if(NSClassFromString(@"ADBannerView") != nil) {
-    [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-  }
-}
-
-- (void)getAd {
-  ADBannerView *iAdView = [[ADBannerView alloc] initWithFrame:CGRectZero];
-  kADBannerContentSizeIdentifierPortrait =
-    &ADBannerContentSizeIdentifierPortrait != nil ?
-      ADBannerContentSizeIdentifierPortrait :
-      ADBannerContentSizeIdentifier320x50;
-  kADBannerContentSizeIdentifierLandscape =
-    &ADBannerContentSizeIdentifierLandscape != nil ?
-      ADBannerContentSizeIdentifierLandscape :
-      ADBannerContentSizeIdentifier480x32;
-  iAdView.requiredContentSizeIdentifiers = [NSSet setWithObjects:
-                                            kADBannerContentSizeIdentifierPortrait,
-                                            kADBannerContentSizeIdentifierLandscape,
-                                            nil];
-  UIDeviceOrientation orientation;
-  if ([self.adWhirlDelegate respondsToSelector:@selector(adWhirlCurrentOrientation)]) {
-    orientation = [self.adWhirlDelegate adWhirlCurrentOrientation];
-  }
-  else {
-    orientation = [UIDevice currentDevice].orientation;
-  }
-
-  if (UIDeviceOrientationIsLandscape(orientation)) {
-    iAdView.currentContentSizeIdentifier = kADBannerContentSizeIdentifierLandscape;
-  }
-  else {
-    iAdView.currentContentSizeIdentifier = kADBannerContentSizeIdentifierPortrait;
-  }
-  [iAdView setDelegate:self];
-
-  self.adNetworkView = iAdView;
-  [iAdView release];
-}
-
-- (void)stopBeingDelegate {
-  ADBannerView *iAdView = (ADBannerView *)self.adNetworkView;
-  if (iAdView != nil) {
-    iAdView.delegate = nil;
-  }
-}
-
-- (void)rotateToOrientation:(UIInterfaceOrientation)orientation {
-  ADBannerView *iAdView = (ADBannerView *)self.adNetworkView;
-  if (iAdView == nil) return;
-  if (UIInterfaceOrientationIsLandscape(orientation)) {
-    iAdView.currentContentSizeIdentifier = kADBannerContentSizeIdentifierLandscape;
-  }
-  else {
-    iAdView.currentContentSizeIdentifier = kADBannerContentSizeIdentifierPortrait;
-  }
-  // ADBanner positions itself in the center of the super view, which we do not
-  // want, since we rely on publishers to resize the container view.
-  // position back to 0,0
-  CGRect newFrame = iAdView.frame;
-  newFrame.origin.x = newFrame.origin.y = 0;
-  iAdView.frame = newFrame;
-}
-
-- (BOOL)isBannerAnimationOK:(AWBannerAnimationType)animType {
-  if (animType == AWBannerAnimationTypeFadeIn) {
-    return NO;
-  }
-  return YES;
-}
-
-- (void)dealloc {
-  [super dealloc];
-}
-
-#pragma mark IAdDelegate methods
-
-- (void)bannerViewDidLoadAd:(ADBannerView *)banner {
-  // ADBanner positions itself in the center of the super view, which we do not
-  // want, since we rely on publishers to resize the container view.
-  // position back to 0,0
-  CGRect newFrame = banner.frame;
-  newFrame.origin.x = newFrame.origin.y = 0;
-  banner.frame = newFrame;
-
-  [adWhirlView adapter:self didReceiveAdView:banner];
-}
-
-- (void)bannerView:(ADBannerView *)banner didFailToReceiveAdWithError:(NSError *)error {
-  [adWhirlView adapter:self didFailAd:error];
-}
-
-- (BOOL)bannerViewActionShouldBegin:(ADBannerView *)banner willLeaveApplication:(BOOL)willLeave {
-  [self helperNotifyDelegateOfFullScreenModal];
-  return YES;
-}
-
-- (void)bannerViewActionDidFinish:(ADBannerView *)banner {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterInMobi.h

@@ -1,37 +0,0 @@
-/*
-
- AdWhirlAdapterInMobi.h
-
- Copyright 2010 AdMob, Inc.
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "IMAdDelegate.h"
-#import "IMAdRequest.h"
-
-@class InMobiAdView;
-
-@interface AdWhirlAdapterInMobi : AdWhirlAdNetworkAdapter <IMAdDelegate> {
-
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-- (NSString *)siteId;
-- (UIViewController *)rootViewControllerForAd;
-- (BOOL)testMode;
-- (Gender)gender;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterInMobi.m

@@ -1,173 +0,0 @@
-/*
-
- AdWhirlAdapterInMobi.m
-
- Copyright 2010 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdapterInMobi.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlView.h"
-#import "IMAdView.h"
-#import "IMAdRequest.h"
-#import "AdWhirlLog.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkRegistry.h"
-
-@implementation AdWhirlAdapterInMobi
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeInMobi;
-}
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-- (void)getAd {
-  IMAdView *inMobiView = [[IMAdView alloc]
-                             initWithFrame:kAdWhirlViewDefaultFrame
-                             imAppId:[self siteId]
-                             imAdUnit:IM_UNIT_320x50
-                             rootViewController:[self rootViewControllerForAd]];
-  [inMobiView autorelease];
-  inMobiView.refreshInterval = REFRESH_INTERVAL_OFF;
-  inMobiView.delegate = self;
-  self.adNetworkView = inMobiView;
-
-  IMAdRequest *request = [IMAdRequest request];
-
-  if ([self testMode]) {
-    request.testMode = true;
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(postalCode)]) {
-    request.postalCode = [adWhirlDelegate postalCode];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(areaCode)]) {
-    request.areaCode = [adWhirlDelegate areaCode];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(dateOfBirth)]) {
-    NSDateFormatter *formatter = [[[NSDateFormatter alloc] init] autorelease];
-    [formatter setDateFormat:@"dd-MM-yyyy"];
-    request.dateOfBirth = [formatter
-                              stringFromDate:[adWhirlDelegate dateOfBirth]];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(gender)]) {
-    if ([adWhirlDelegate gender] == @"m") {
-      request.gender = G_M;
-    } else if ([adWhirlDelegate gender] == @"f") {
-      request.gender = G_F;
-    } else {
-      request.gender = G_None;
-    }
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(keywords)]) {
-    request.keywords = [adWhirlDelegate keywords];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(searchString)]) {
-    request.searchString = [adWhirlDelegate searchString];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(incomeLevel)]) {
-    request.income = [adWhirlDelegate incomeLevel];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(inMobiEducation)]) {
-    request.education = [adWhirlDelegate inMobiEducation];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(inMobiEthnicity)]) {
-    request.ethnicity = [adWhirlDelegate inMobiEthnicity];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(dateOfBirth)]) {
-    request.age = [self helperCalculateAge];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(inMobiInterests)]) {
-    request.interests = [adWhirlDelegate inMobiInterests];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(inMobiParamsDictionary)]) {
-    request.paramsDictionary = [adWhirlDelegate inMobiParamsDictionary];
-  }
-  if (!adWhirlConfig.locationOn) {
-    request.isLocationEnquiryAllowed = false;
-  }
-
-  [inMobiView loadIMAdRequest:request];
-}
-
-- (void)stopBeingDelegate {
-  InMobiAdView *inMobiView = (InMobiAdView *)self.adNetworkView;
-  if (inMobiView != nil) {
-    [inMobiView setDelegate:nil];
-  }
-}
-
-- (void)dealloc {
-  [super dealloc];
-}
-
-#pragma mark IMAdView helper methods
-
-- (NSString *)siteId {
-  if ([adWhirlDelegate respondsToSelector:@selector(inMobiAppId)]) {
-    return [adWhirlDelegate inMobiAppID];
-  }
-  return networkConfig.pubId;
-}
-
-- (UIViewController *)rootViewControllerForAd {
-  return [adWhirlDelegate viewControllerForPresentingModalView];
-}
-
-- (BOOL)testMode {
-  if ([adWhirlDelegate respondsToSelector:@selector(adWhirlTestMode)])
-    return [adWhirlDelegate adWhirlTestMode];
-  return NO;
-}
-
-- (Gender)gender {
-  if ([adWhirlDelegate respondsToSelector:@selector(gender)]) {
-    NSString *genderStr = [adWhirlDelegate gender];
-    if ([genderStr isEqualToString:@"f"]) {
-      return G_F;
-    } else if ([genderStr isEqualToString:@"m"]) {
-      return G_M;
-    }
-  }
-  return G_None;
-}
-
-#pragma mark IMAdDelegate methods
-
-- (void)adViewDidFinishRequest:(IMAdView *)adView {
-  [adWhirlView adapter:self didReceiveAdView:adView];
-}
-
-- (void)adView:(IMAdView *)view didFailRequestWithError:(IMAdError *)error {
-  NSLog(@"Error %@", error);
-  [adWhirlView adapter:self didFailAd:nil];
-}
-
-- (void)adViewWillPresentScreen:(IMAdView *)adView {
-  [self helperNotifyDelegateOfFullScreenModal];
-}
-
-- (void)adViewWillDismissScreen:(IMAdView *)adView {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-- (void)adViewWillLeaveApplication:(IMAdView *)adView {
-  [self helperNotifyDelegateOfFullScreenModal];
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterJumpTap.h

@@ -1,30 +0,0 @@
-/*
-
- AdWhirlAdapterJumpTap.h
- 
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
-*/
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "JTAdWidget.h"
-
-@interface AdWhirlAdapterJumpTap : AdWhirlAdNetworkAdapter <JTAdWidgetDelegate> {
-
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterJumpTap.m

@@ -1,238 +0,0 @@
-/*
-
- AdWhirlAdapterJumpTap.m
-
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdapterJumpTap.h"
-#import "AdWhirlView.h"
-#import "AdWhirlConfig.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkRegistry.h"
-
-
-@implementation AdWhirlAdapterJumpTap
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeJumpTap;
-}
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-- (void)getAd {
-  JTAdWidget *widget = [[JTAdWidget alloc] initWithDelegate:self
-                                         shouldStartLoading:YES];
-  widget.frame = kAdWhirlViewDefaultFrame;
-  widget.refreshInterval = 0; // do not self-refresh
-  self.adNetworkView = widget;
-
-  if ([adWhirlDelegate respondsToSelector:@selector(jumptapTransitionType)]) {
-    widget.transition = [adWhirlDelegate jumptapTransitionType];
-  }
-  [widget release];
-}
-
-- (void)stopBeingDelegate {
-  // no way to set JTAdWidget's delegate to nil
-}
-
-- (void)dealloc {
-  [super dealloc];
-}
-
-#pragma mark JTAdWidgetDelegate methods
-
-- (NSString *)publisherId:(id)theWidget {
-  NSString *pubId = networkConfig.pubId;
-  if (pubId == nil) {
-    NSDictionary *cred = networkConfig.credentials;
-    if (cred != nil) {
-      pubId = [cred objectForKey:@"publisherID"];
-    }
-  }
-  return pubId;
-}
-
-- (NSString *)site:(id)theWidget {
-  NSString *siteId = nil;
-  if ([adWhirlDelegate respondsToSelector:@selector(jumptapSiteId)]) {
-     siteId = [adWhirlDelegate jumptapSiteId];
-  }
-  if (siteId == nil) {
-    NSDictionary *cred = networkConfig.credentials;
-    if (cred != nil) {
-      siteId = [cred objectForKey:@"siteID"];
-    }
-  }
-  return siteId;
-}
-
-- (NSString *)adSpot:(id)theWidget {
-  NSString *spotId = nil;
-  if ([adWhirlDelegate respondsToSelector:@selector(jumptapSpotId)]) {
-    spotId = [adWhirlDelegate jumptapSpotId];
-  }
-  if (spotId == nil) {
-    NSDictionary *cred = networkConfig.credentials;
-    if (cred != nil) {
-      spotId = [cred objectForKey:@"spotID"];
-    }
-  }
-  return spotId;
-}
-
-- (BOOL)shouldRenderAd:(id)theWidget {
-  [adWhirlView adapter:self didReceiveAdView:theWidget];
-  return YES;
-}
-
-- (void)beginAdInteraction:(id)theWidget {
-  [self helperNotifyDelegateOfFullScreenModal];
-}
-
-- (void)endAdInteraction:(id)theWidget {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-- (void)adWidget:(id)theWidget didFailToShowAd:(NSError *)error {
-  [adWhirlView adapter:self didFailAd:error];
-}
-
-- (void)adWidget:(id)theWidget didFailToRequestAd:(NSError *)error {
-  [adWhirlView adapter:self didFailAd:error];
-}
-
-- (BOOL)respondsToSelector:(SEL)selector {
-  if (selector == @selector(location:)
-      && ![adWhirlDelegate respondsToSelector:@selector(locationInfo)]) {
-    return NO;
-  }
-  else if (selector == @selector(query:)
-           && ![adWhirlDelegate respondsToSelector:@selector(keywords)]) {
-    return NO;
-  }
-  else if (selector == @selector(category:)
-           && ![adWhirlDelegate respondsToSelector:@selector(jumptapCategory)]) {
-    return NO;
-  }
-  else if (selector == @selector(adultContent:)
-           && ![adWhirlDelegate respondsToSelector:@selector(jumptapAdultContent)]) {
-    return NO;
-  }
-  return [super respondsToSelector:selector];
-}
-
-#pragma mark JTAdWidgetDelegate methods -Targeting
-
-- (NSString *)query:(id)theWidget {
-  return [adWhirlDelegate keywords];
-}
-
-- (NSString *)category:(id)theWidget {
-  return [adWhirlDelegate jumptapCategory];
-}
-
-- (AdultContent)adultContent:(id)theWidget {
-  return [adWhirlDelegate jumptapAdultContent];
-}
-
-#pragma mark JTAdWidgetDelegate methods -General Configuration
-
-- (NSDictionary*)extraParameters:(id)theWidget {
-  NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:10];
-  if ([adWhirlDelegate respondsToSelector:@selector(dateOfBirth)]) {
-    NSInteger age = [self helperCalculateAge];
-    if (age >= 0)
-      [dict setObject:[NSString stringWithFormat:@"%d",age] forKey:@"mt-age"];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(gender)]) {
-    NSString *gender = [adWhirlDelegate gender];
-    if (gender != nil)
-      [dict setObject:gender forKey:@"mt-gender"];
-  }
-  if ([adWhirlDelegate respondsToSelector:@selector(incomeLevel)]) {
-    NSUInteger income = [adWhirlDelegate incomeLevel];
-    NSString *level = nil;
-    if (income < 15000) {
-      level = @"000_015";
-    }
-    else if (income < 20000) {
-      level = @"015_020";
-    }
-    else if (income < 30000) {
-      level = @"020_030";
-    }
-    else if (income < 40000) {
-      level = @"030_040";
-    }
-    else if (income < 50000) {
-      level = @"040_050";
-    }
-    else if (income < 75000) {
-      level = @"050_075";
-    }
-    else if (income < 100000) {
-      level = @"075_100";
-    }
-    else if (income < 125000) {
-      level = @"100_125";
-    }
-    else if (income < 150000) {
-      level = @"125_150";
-    }
-    else {
-      level = @"150_OVER";
-    }
-    [dict setObject:level forKey:@"mt-hhi"];
-  }
-  return dict;
-}
-
-- (UIColor *)adBackgroundColor:(id)theWidget {
-  return [self helperBackgroundColorToUse];
-}
-
-- (UIColor *)adForegroundColor:(id)theWidget {
-  return [self helperTextColorToUse];
-}
-
-#pragma mark JTAdWidgetDelegate methods -Location Configuration
-
-- (BOOL)allowLocationUse:(id)theWidget {
-  return adWhirlConfig.locationOn;
-}
-
-- (CLLocation*)location:(id)theWidget {
-  if (![adWhirlDelegate respondsToSelector:@selector(locationInfo)]) {
-    return nil;
-  }
-  return [adWhirlDelegate locationInfo];
-}
-
-#pragma mark JTAdWidgetDelegate methods -Ad Display and User Interaction
-// The ad orientation changed
-//- (void)adWidget:(id)theWidget orientationHasChangedTo:(UIInterfaceOrientation)interfaceOrientation;
-
-// Language methods
-//- (NSString*)getPlayVideoPrompt:(id)theWidget;
-//- (NSString*)getBackButtonPrompt:(id)theWidget isInterstitial:(BOOL)isInterstitial;
-//- (NSString*)getSafariButtonPrompt:(id)theWidget;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterMdotM.h

@@ -1,38 +0,0 @@
-/*
-
- AdWhirlAdapterMdotM.h
- 
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
-*/
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "AdWhirlCustomAdView.h"
-#import "AdWhirlWebBrowserController.h"
-
-@interface AdWhirlAdapterMdotM : AdWhirlAdNetworkAdapter <AdWhirlCustomAdViewDelegate, AdWhirlWebBrowserControllerDelegate> {
-  BOOL requesting;
-  CLLocationManager *locationManager;
-  NSURLConnection *adConnection;
-  NSMutableData *adData;
-  NSURLConnection *imageConnection;
-  NSMutableData *imageData;
-  AdWhirlCustomAdView *adView;
-  AdWhirlWebBrowserController *webBrowserController;
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterMdotM.m

@@ -1,423 +0,0 @@
-/*
-
- AdWhirlAdapterMdotM.m
- 
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
-*/
-
-#import "AdWhirlAdapterMdotM.h"
-#import "AdWhirlView.h"
-#import "AdWhirlConfig.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlDelegateProtocol.h"
-#import "AdWhirlLog.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkRegistry.h"
-#import "AdWhirlAdapterCustom.h"
-#import "AdWhirlError.h"
-#import "CJSONDeserializer.h"
-#import "AdWhirlCustomAdView.h"
-
-
-@interface AdWhirlAdapterMdotM ()
-
-- (BOOL)parseAdData:(NSData *)data error:(NSError **)error;
-
-@property (nonatomic,readonly) CLLocationManager *locationManager;
-@property (nonatomic,retain) NSURLConnection *adConnection;
-@property (nonatomic,retain) NSURLConnection *imageConnection;
-@property (nonatomic,retain) AdWhirlCustomAdView *adView;
-@property (nonatomic,retain) AdWhirlWebBrowserController *webBrowserController;
-
-@end
-
-
-@implementation AdWhirlAdapterMdotM
-
-@synthesize adConnection;
-@synthesize imageConnection;
-@synthesize adView;
-@synthesize webBrowserController;
-
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeMdotM;
-}
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-- (BOOL)useTestAd {
-  if ([adWhirlDelegate respondsToSelector:@selector(adWhirlTestMode)])
-    return [adWhirlDelegate adWhirlTestMode];
-  return NO;
-}
-
-
-- (id)initWithAdWhirlDelegate:(id<AdWhirlDelegate>)delegate
-       view:(AdWhirlView *)view
-           config:(AdWhirlConfig *)config
-    networkConfig:(AdWhirlAdNetworkConfig *)netConf {
-  self = [super initWithAdWhirlDelegate:delegate
-    view:view
-    config:config
-    networkConfig:netConf];
-  if (self != nil) {
-    adData = [[NSMutableData alloc] init];
-    imageData = [[NSMutableData alloc] init];
-  }
-  return self;
-}
-
-- (NSMutableString *)appendUserContextDic:(NSDictionary *)dic withUrl:(NSString *)sUrl {
-  NSArray *keyArray = [dic allKeys];
-  NSMutableString *str = [NSMutableString stringWithString:sUrl];
-       
-  //Iterate over the context disctionary and for each kay-value pair create a string of the format &key=value
-  for (int i = 0; i < [keyArray count]; i++) {
-    [str appendFormat:@"&%@=%@",[keyArray objectAtIndex:i], [dic objectForKey:[keyArray objectAtIndex:i]]];
-  }
-  return str;
-}
-
-
-- (void)getAd {
-  @synchronized(self) {
-    if (requesting) return;
-    requesting = YES;
-  }
-           
-  NSString *appKey = networkConfig.pubId;
-
-  if ([adWhirlDelegate respondsToSelector:@selector(MdotMApplicationKey)] ) {
-    appKey = [adWhirlDelegate MdotMApplicationKey];
-  }
-
-  UIDevice *device = [UIDevice currentDevice];
-  NSBundle *bundle = [NSBundle mainBundle];
-  NSLocale *locale = [NSLocale currentLocale];
-  NSString *userAgent = [NSString stringWithFormat:@"%@ %@ (%@; %@ %@; %@)",
-          [bundle objectForInfoDictionaryKey:@"CFBundleDisplayName"],
-          [bundle objectForInfoDictionaryKey:@"CFBundleVersion"],
-          [device model],
-          [device systemName], [device systemVersion],
-          [locale localeIdentifier]];
-  int test;
-  if ( [self useTestAd] ) {
-    test = 1;
-  } else
-    test = 0;
-       
-  NSString *str = [NSString stringWithFormat:
-            @"http://ads.mdotm.com/ads/feed.php?appver=%d&v=%@&apikey=mdotm&appkey=%@&deviceid=%@&width=320&height=50&fmt=json&ua=%@&test=%d",
-          kAdWhirlAppVer, [[UIDevice currentDevice] systemVersion],
-          appKey, [[UIDevice currentDevice] uniqueIdentifier], userAgent, test];
-               
-  NSMutableDictionary *userContextDic = [[NSMutableDictionary alloc] initWithCapacity:2];
-  if ( [userContextDic count] > 0 ) {
-    str = [self appendUserContextDic:userContextDic withUrl:str];
-  }              
-       
-  NSString *urlString = [str stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-
-  NSURL *adRequestURL =  [[NSURL alloc] initWithString:urlString];
-  AWLogDebug(@"Requesting MdotM ad (%@) %@", str, adRequestURL);
-  NSURLRequest *adRequest = [NSURLRequest requestWithURL:adRequestURL];
-       
-
-  NSURLConnection *conn = [[NSURLConnection alloc] initWithRequest:adRequest
-               delegate:self];
-  self.adConnection = conn;
-  [conn release];
-  [adRequestURL release];
-  [userContextDic release];
-}
-
-
-
-
-#pragma mark MdotMDelegate optional methods
-
-- (BOOL)respondsToSelector:(SEL)selector {
-  if (selector == @selector(location)
-      && ![adWhirlDelegate respondsToSelector:@selector(location)]) {
-    return NO;
-  }
-  else if (selector == @selector(userContext)
-     && ![adWhirlDelegate respondsToSelector:@selector(userContext)]) {
-    return NO;
-  }  return [super respondsToSelector:selector];
-}
-
-
-- (CLLocationManager *)locationManager {
-  if (locationManager == nil) {
-    locationManager = [[CLLocationManager alloc] init];
-  }
-  return locationManager;
-}
-
-- (BOOL)parseEnums:(int *)val
-            adInfo:(NSDictionary*)info
-            minVal:(int)min
-            maxVal:(int)max
-         fieldName:(NSString *)name
-             error:(NSError **)error {
-  NSString *str = [info objectForKey:name];
-  if (str == nil) {
-    if (error != nil)
-      *error = [AdWhirlError errorWithCode:AdWhirlCustomAdDataError
-                               description:[NSString stringWithFormat:
-                                            @"MdotM ad data has no '%@' field", name]];
-    return NO;
-  }
-  int intVal = [str intValue];
-  if (intVal <= min || intVal >= max) {
-    if (error != nil)
-      *error = [AdWhirlError errorWithCode:AdWhirlCustomAdDataError
-                               description:[NSString stringWithFormat:
-                                            @"MdotM ad data: Invalid value for %@ - %d", name, intVal]];
-    return NO;
-  }
-  *val = intVal;
-  return YES;
-}  
-
-- (BOOL)parseAdData:(NSData *)data error:(NSError **)error {
-  NSError *jsonError = nil;
-  id parsed = [[CJSONDeserializer deserializer] deserialize:data error:&jsonError];
-  if (parsed == nil) {
-    if (error != nil)
-      *error = [AdWhirlError errorWithCode:AdWhirlCustomAdParseError
-                               description:@"Error parsing MdotM ad JSON from server"
-                           underlyingError:jsonError];
-    return NO;
-  }
-  if ([parsed isKindOfClass:[NSArray class]]) {
-    NSArray *ads = parsed;
-    NSDictionary *adInfo = nil;
-    if ( [ads count] == 0 ) {
-      return(NO);
-    } else {
-      id parsed0 =[ads objectAtIndex:0];
-      if ( [parsed0 isKindOfClass:[NSDictionary class]] ) {
-        adInfo = parsed0;
-        
-        // gather up and validate ad info
-        NSString *text = [adInfo objectForKey:@"ad_text"];
-        NSString *redirectURLStr = [adInfo objectForKey:@"landing_url"];
-        
-        int adTypeInt;
-        if (![self parseEnums:&adTypeInt
-                       adInfo:adInfo
-                       minVal:AWCustomAdTypeMIN
-                       maxVal:AWCustomAdTypeMAX
-                    fieldName:@"ad_type"
-                        error:error]) {
-          return NO;
-        }
-        AWCustomAdType adType = adTypeInt;
-        
-        int launchTypeInt;
-        if (![self parseEnums:&launchTypeInt
-                       adInfo:adInfo
-                       minVal:AWCustomAdLaunchTypeMIN
-                       maxVal:AWCustomAdLaunchTypeMAX
-                    fieldName:@"launch_type"
-                        error:error]) {
-          return NO;
-        }      
-        AWCustomAdLaunchType launchType = launchTypeInt;
-        AWCustomAdWebViewAnimType animType = AWCustomAdWebViewAnimTypeCurlDown;
-        
-        NSURL *redirectURL = nil;
-        if (redirectURLStr == nil) {
-          AWLogWarn(@"No redirect URL for MdotM ad");
-        } else {
-          redirectURL = [[NSURL alloc] initWithString:redirectURLStr];
-          if (!redirectURL)
-            AWLogWarn(@"MdotM ad: Malformed redirect URL string %@", redirectURLStr);
-        }
-        AWLogDebug(@"Got MdotM ad %@ %@ %d %d %d", text, redirectURL,
-                   adType, launchType, animType);
-        
-        self.adView = [[AdWhirlCustomAdView alloc] initWithDelegate:self
-                                                               text:text
-                                                        redirectURL:redirectURL
-                                                    clickMetricsURL:nil
-                                                             adType:adType
-                                                         launchType:launchType
-                                                           animType:animType
-                                                    backgroundColor:[self helperBackgroundColorToUse]
-                                                          textColor:[self helperTextColorToUse]];
-        [self.adView release];
-        self.adNetworkView = adView;
-        [redirectURL release];
-        if (adView == nil) {
-          if (error != nil)
-            *error = [AdWhirlError errorWithCode:AdWhirlCustomAdDataError
-                                     description:@"Error initializing MdotM ad view"];
-          return NO;
-        }      
-        
-        // fetch image
-        id imageURL = [adInfo objectForKey:@"img_url"];
-        if ( [imageURL isKindOfClass:[NSString class]]) {
-          AWLogDebug(@"Request MdotM ad image at %@", imageURL);
-          NSURLRequest *imageRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:imageURL]];
-          NSURLConnection *conn = [[NSURLConnection alloc] initWithRequest:imageRequest
-                                                                  delegate:self];
-          self.imageConnection = conn;
-          [conn release];
-        } else {
-          return(NO);
-        }
-      } else {
-        return(NO);
-      }
-    }
-  } else {
-    if (error != nil)
-      *error = [AdWhirlError errorWithCode:AdWhirlCustomAdDataError
-                               description:@"Expected top-level dictionary in MdotM ad data"];
-    return NO;
-  }
-  return YES;
-}
-
-- (void)stopBeingDelegate {
-    AdWhirlCustomAdView *theAdView = (AdWhirlCustomAdView *)self.adNetworkView;
-    if (theAdView != nil) {
-        theAdView.delegate = nil;
-    }
-}
-
-- (void)dealloc {
-  [locationManager release], locationManager = nil;
-  [adConnection release], adConnection = nil;
-  [adData release], adData = nil;
-  [imageConnection release], imageConnection = nil;
-  [imageData release], imageData = nil;
-  [adView release], adView = nil;
-  [webBrowserController release], webBrowserController = nil;
-  [super dealloc];
-}
-
-#pragma mark NSURLConnection delegate methods.
-
-- (void)connection:(NSURLConnection *)conn didReceiveResponse:(NSURLResponse *)response {
-  if (conn == adConnection) {
-    [adData setLength:0];
-  }
-  else if (conn == imageConnection) {
-    [imageData setLength:0];
-  }
-}
-
-- (void)connection:(NSURLConnection *)conn didFailWithError:(NSError *)error {
-  if (conn == adConnection) {
-    [adWhirlView adapter:self didFailAd:[AdWhirlError errorWithCode:AdWhirlCustomAdConnectionError
-                                                        description:@"Error connecting to MdotM ad server"
-                                                    underlyingError:error]];
-    requesting = NO;
-  } else if (conn == imageConnection) {
-    [adWhirlView adapter:self didFailAd:[AdWhirlError errorWithCode:AdWhirlCustomAdConnectionError
-                                                        description:@"Error connecting to MdotM to fetch image"
-                                                    underlyingError:error]];
-    requesting = NO;
-  }
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)conn {
-  if (conn == adConnection) {
-    NSError *error = nil;
-    if (![self parseAdData:adData error:&error]) {
-      [adWhirlView adapter:self didFailAd:error];
-      requesting = NO;
-      return;
-    }
-  }
-  else if (conn == imageConnection) {
-    UIImage *image = [[UIImage alloc] initWithData:imageData];
-    if (image == nil) {
-      [adWhirlView adapter:self
-                 didFailAd:[AdWhirlError errorWithCode:AdWhirlCustomAdImageError
-                                           description:@"Cannot initialize MdotM ad image from data"]];
-      requesting = NO;
-      return;
-    }
-    adView.image = image;
-    [adView setNeedsDisplay];
-    [image release];
-    requesting = NO;
-    [adWhirlView adapter:self didReceiveAdView:self.adView];
-  }
-}
-
-- (void)connection:(NSURLConnection *)conn didReceiveData:(NSData *)data {
-  if (conn == adConnection) {
-    [adData appendData:data];
-  }
-  else if (conn == imageConnection) {
-    [imageData appendData:data];
-  }
-}
-
-#pragma mark AdWhirlCustomAdViewDelegate methods
-
-- (void)adTapped:(AdWhirlCustomAdView *)ad {
-  if (ad != adView) return;
-  if (ad.clickMetricsURL != nil) {
-    NSURLRequest *metRequest = [NSURLRequest requestWithURL:ad.clickMetricsURL];
-    [NSURLConnection connectionWithRequest:metRequest
-         delegate:nil]; // fire and forget
-  }
-  if (ad.redirectURL == nil) {
-    AWLogError(@"MdotM ad redirect URL is nil");
-    return;
-  }
-  switch (ad.launchType) {
-  case AWCustomAdLaunchTypeSafari:
-    [[UIApplication sharedApplication] openURL:ad.redirectURL];
-    break;
-  case AWCustomAdLaunchTypeCanvas:
-    if (self.webBrowserController == nil) {
-      AdWhirlWebBrowserController *ctrlr = [[AdWhirlWebBrowserController alloc] init];
-      self.webBrowserController = ctrlr;
-      [ctrlr release];
-    }
-    webBrowserController.delegate = self;
-    [webBrowserController presentWithController:[adWhirlDelegate viewControllerForPresentingModalView] 
-                                     transition:ad.animType];
-    [self helperNotifyDelegateOfFullScreenModal];
-    [webBrowserController loadURL:ad.redirectURL];
-    break;
-  default:
-    AWLogError(@"MdotM ad: Unsupported launch type %d", ad.launchType);
-    break;
-  }
-}
-
-#pragma mark AdWhirlWebBrowserControllerDelegate methods
-
-- (void)webBrowserClosed:(AdWhirlWebBrowserController *)controller {
-  if (controller != webBrowserController) return;
-  self.webBrowserController = nil; // don't keep around to save memory
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterMillennial.h

@@ -1,30 +0,0 @@
-/*
-
- AdWhirlAdapterMillennial.h
- 
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
-*/
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "MMAdView.h"
-
-@interface AdWhirlAdapterMillennial : AdWhirlAdNetworkAdapter <MMAdDelegate> {
-  NSMutableDictionary *requestData;
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterMillennial.m

@@ -1,227 +0,0 @@
-/*
-
- AdWhirlAdapterMillennial.m
-
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdapterMillennial.h"
-#import "AdWhirlView.h"
-#import "AdWhirlConfig.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlDelegateProtocol.h"
-#import "AdWhirlLog.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkRegistry.h"
-
-#define kMillennialAdFrame (CGRectMake(0, 0, 320, 53))
-
-@interface AdWhirlAdapterMillennial ()
-
-- (CLLocationDegrees)latitude;
-
-- (CLLocationDegrees)longitude;
-
-- (NSInteger)age;
-
-- (NSString *)zipCode;
-
-- (NSString *)sex;
-
-@end
-
-
-@implementation AdWhirlAdapterMillennial
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeMillennial;
-}
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-- (void)getAd {
-  NSString *apID;
-  if ([adWhirlDelegate respondsToSelector:@selector(millennialMediaApIDString)]) {
-    apID = [adWhirlDelegate millennialMediaApIDString];
-  }
-  else {
-    apID = networkConfig.pubId;
-  }
-
-  requestData = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
-                 @"adwhirl", @"vendor",
-                 nil];
-  if ([self respondsToSelector:@selector(zipCode)]) {
-    [requestData setValue:[self zipCode] forKey:@"zip"];
-  }
-  if ([self respondsToSelector:@selector(age)]) {
-    [requestData setValue:[NSString stringWithFormat:@"%d",[self age]] forKey:@"age"];
-  }
-  if ([self respondsToSelector:@selector(sex)]) {
-    [requestData setValue:[self sex] forKey:@"sex"];
-  }
-  if ([self respondsToSelector:@selector(latitude)]) {
-    [requestData setValue:[NSString stringWithFormat:@"%lf",[self latitude]] forKey:@"lat"];
-  }
-  if ([self respondsToSelector:@selector(longitude)]) {
-    [requestData setValue:[NSString stringWithFormat:@"%lf",[self longitude]] forKey:@"long"];
-  }
-  MMAdType adType = MMBannerAdTop;
-  if ([adWhirlDelegate respondsToSelector:@selector(millennialMediaAdType)]) {
-    adType = [adWhirlDelegate millennialMediaAdType];
-  }
-  MMAdView *adView = [MMAdView adWithFrame:kMillennialAdFrame
-                                      type:adType
-                                      apid:apID
-                                  delegate:self
-                                    loadAd:YES
-                                startTimer:NO];
-  self.adNetworkView = adView;
-}
-
-- (void)stopBeingDelegate {
-  MMAdView *adView = (MMAdView *)adNetworkView;
-  if (adView != nil) {
-    [adView setRefreshTimerEnabled:false];
-    adView.delegate = nil;
-  }
-}
-
-- (void)dealloc {
-  [requestData release];
-  [super dealloc];
-}
-
-#pragma mark MMAdDelegate methods
-
-- (NSDictionary *)requestData {
-  AWLogDebug(@"Sending requestData to MM: %@", requestData);
-  return requestData;
-}
-
-- (void)adRequestSucceeded:(MMAdView *)adView {
-  // millennial ads are slightly taller than default frame, at 53 pixels.
-  [adWhirlView adapter:self didReceiveAdView:adNetworkView];
-}
-
-- (void)adRequestFailed:(MMAdView *)adView {
-  [adWhirlView adapter:self didFailAd:nil];
-}
-
-- (void)adModalWillAppear {
-  [self helperNotifyDelegateOfFullScreenModal];
-}
-
-- (void)adModalWasDismissed {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-#pragma mark requestData optional methods
-
-// The follow is kept for gathering requestData
-
-- (BOOL)respondsToSelector:(SEL)selector {
-  if (selector == @selector(latitude)
-      && ![adWhirlDelegate respondsToSelector:@selector(locationInfo)]) {
-    return NO;
-  }
-  else if (selector == @selector(longitude)
-           && ![adWhirlDelegate respondsToSelector:@selector(locationInfo)]) {
-    return NO;
-  }
-  else if (selector == @selector(age)
-           && (!([adWhirlDelegate respondsToSelector:@selector(millennialMediaAge)]
-                 || [adWhirlDelegate respondsToSelector:@selector(dateOfBirth)])
-               || [self age] < 0)) {
-    return NO;
-  }
-  else if (selector == @selector(zipCode)
-           && ![adWhirlDelegate respondsToSelector:@selector(postalCode)]) {
-    return NO;
-  }
-  else if (selector == @selector(sex)
-           && ![adWhirlDelegate respondsToSelector:@selector(gender)]) {
-    return NO;
-  }
-  else if (selector == @selector(householdIncome)
-           && ![adWhirlDelegate respondsToSelector:@selector(incomeLevel)]) {
-    return NO;
-  }
-  else if (selector == @selector(educationLevel)
-           && ![adWhirlDelegate respondsToSelector:@selector(millennialMediaEducationLevel)]) {
-    return NO;
-  }
-  else if (selector == @selector(ethnicity)
-           && ![adWhirlDelegate respondsToSelector:@selector(millennialMediaEthnicity)]) {
-    return NO;
-  }
-  return [super respondsToSelector:selector];
-}
-
-- (CLLocationDegrees)latitude {
-  CLLocation *loc = [adWhirlDelegate locationInfo];
-  if (loc == nil) return 0.0;
-  return loc.coordinate.latitude;
-}
-
-- (CLLocationDegrees)longitude {
-  CLLocation *loc = [adWhirlDelegate locationInfo];
-  if (loc == nil) return 0.0;
-  return loc.coordinate.longitude;
-}
-
-- (NSInteger)age {
-  if ([adWhirlDelegate respondsToSelector:@selector(millennialMediaAge)]) {
-    return [adWhirlDelegate millennialMediaAge];
-  }
-  return [self helperCalculateAge];
-}
-
-- (NSString *)zipCode {
-  return [adWhirlDelegate postalCode];
-}
-
-- (NSString *)sex {
-  NSString *gender = [adWhirlDelegate gender];
-  NSString *sex = @"";
-  if (gender == nil)
-    return sex;
-  if ([gender compare:@"m"] == NSOrderedSame) {
-    sex = @"M";
-  }
-  else if ([gender compare:@"f"] == NSOrderedSame) {
-    sex = @"F";
-  }
-  return sex;
-}
-
-/*
-- (NSInteger)householdIncome {
-  return (NSInteger)[adWhirlDelegate incomeLevel];
-}
-
-- (MMEducation)educationLevel {
-  return [adWhirlDelegate millennialMediaEducationLevel];
-}
-
-- (MMEthnicity)ethnicity {
-  return [adWhirlDelegate millennialMediaEthnicity];
-}
-*/
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterNexage.h

@@ -1,45 +0,0 @@
-/*
-
- AdWhirlAdapterNexage.h
- Copyright 2011 Google, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-
-#import <Foundation/Foundation.h>
-#import "AdWhirlAdNetworkAdapter.h"
-#import "NexageDelegateProtocol.h"
-
-@class NexageAdViewController;
-
-@interface AdWhirlAdapterNexage : AdWhirlAdNetworkAdapter
-    <NexageDelegateProtocol> {
-  NexageAdViewController* adViewController;
-  NSString* position;
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-- (NSDate *)dateOfBirth;
-- (NSString *)postCode;
-- (NSString *)gender;
-- (NSString *)keywords;
-- (NSInteger)houseIncome;
-- (NSString *)city;
-- (NSString *)designatedMarketArea;
-- (NSString *)country;
-- (NSString *)ethnicity;
-- (NSString *)maritalStatus;
-- (NSString *)areaCode;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterNexage.m

@@ -1,219 +0,0 @@
-/*
-
- AdWhirlAdapterNexage.m
- Copyright 2011 Google, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- */
-
-#import "AdWhirlAdapterNexage.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkRegistry.h"
-#import "AdWhirlView.h"
-#import "AdWhirlConfig.h"
-#import "NexageAdViewController.h"
-#import "NexageAdParameters.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "AdWhirlError.h"
-
-@implementation AdWhirlAdapterNexage
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeNexage;
-}
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-- (void)getAd{
-  NSDictionary* atts = [NSDictionary dictionaryWithObjectsAndKeys:
-    [self dateOfBirth], @"u(dob)",
-    [self country], @"u(country)",
-    [self city], @"u(city)",
-    [self designatedMarketArea], @"u(dma)",
-    [self ethnicity], @"u(eth)",
-    [self gender], @"u(gender)",
-    [NSNumber numberWithDouble:[self houseIncome]], @"u(hhi)",
-    [self keywords], @"u(keywords)",
-    [self maritalStatus], @"u(marital)",
-    [self postCode], @"u(zip)",
-    nil];
-
-  NSDictionary* credDict;
-  if ([adWhirlDelegate respondsToSelector:@selector(nexageDictionary)]) {
-    credDict = [adWhirlDelegate nexageDictionary];
-  }
-  else {
-    credDict = [networkConfig credentials];
-  }
-
-  BOOL testMode = NO;
-  if ([adWhirlDelegate respondsToSelector:@selector(adWhirlTestMode)]
-      && [adWhirlDelegate adWhirlTestMode]) {
-    testMode = YES;
-  }
-
-  // Nexage does weird things with position which can result in an over-release,
-  // so we're basically forced to leak this...
-  position = [[credDict objectForKey:@"position"] copy];
-  if(position == nil){
-    [adWhirlView adapter:self didFailAd:nil];
-    return;
-  }
-
-  adViewController =
-      [[NexageAdViewController alloc] initWithDelegate:position delegate:self];
-  [adViewController setEnable:YES];
-
-
-  [adViewController setAttributes:atts];
-  [adViewController setTestMode:testMode];
-  [adViewController locationAware:adWhirlConfig.locationOn];
-#ifdef ADWHIRL_DEBUG
-  [adViewController enableLogging:YES];
-#endif
-  self.adNetworkView = adViewController.view;
-}
-
-- (void)stopBeingDelegate {
-  if (adViewController != nil) {
-    adViewController.delegate = nil;
-  }
-}
-
-- (void)dealloc {
-  [self stopBeingDelegate];
-  [adViewController setAttributes:nil];
-  [adViewController release];
-  adViewController = nil;
-  [super dealloc];
-}
-
-#pragma mark NexageDelegateProtocol
-
-- (void)adReceived:(UIView *)ad {
-  [adWhirlView adapter:self didReceiveAdView:ad];
-}
-/**
- * This method will be called when user clicks the ad banner.
- * The URL is an optional parameter, if Ad is from the Nexage mediation
- * platform, you will get validate url, if it is nil, that means the action
- * is from integrated sdk. Please check if (url == nil). The return YES, means
- * the sdk will handle click event, otherwise sdk will ignore the user action.
- * Basic Ad network principle should always return YES. Please refer our dev
- * document for details
- */
-- (BOOL)adActionShouldBegin:(NSURLRequest *)request
-       willLeaveApplication:(BOOL)willLeave {
-  [self helperNotifyDelegateOfFullScreenModal];
-  return YES;
-}
-
-/**
- * The delegate will be called when full screen web browser is closed
- */
-- (void)adFullScreenWebBrowserWillClose {
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-/**
- * identify the ad did not receive at this momnent.
- */
-- (void)didFailToReceiveAd {
-  [adWhirlView adapter:self didFailAd:nil];
-}
-
-- (NSString *)dcnForAd {
-  NSDictionary *credDict;
-  if ([adWhirlDelegate respondsToSelector:@selector(nexageDictionary)]) {
-    credDict = [adWhirlDelegate nexageDictionary];
-  }
-  else {
-    credDict = [networkConfig credentials];
-  }
-  return [credDict objectForKey:@"dcn"];
-}
-
-- (UIViewController*)currentViewController {
-  return [adWhirlDelegate viewControllerForPresentingModalView];
-}
-
-#pragma mark user profiles
-
-- (NSDate *)dateOfBirth {
-  if([adWhirlDelegate respondsToSelector:@selector(dateOfBirth)])
-    return [adWhirlDelegate dateOfBirth];
-  return nil;
-}
-
-- (NSString *)postCode {
-  if([adWhirlDelegate respondsToSelector:@selector(postalCode)])
-    return [adWhirlDelegate postalCode];
-  else return nil;
-}
-
-- (NSString *)gender {
-  if([adWhirlDelegate respondsToSelector:@selector(gender)])
-    return [adWhirlDelegate gender];
-  else return nil;
-}
-
-- (NSString *)keywords {
-  if([adWhirlDelegate respondsToSelector:@selector(keywords)])
-    return [adWhirlDelegate keywords];
-  else return nil;
-}
-
-- (NSInteger)houseIncome {
-  if([adWhirlDelegate respondsToSelector:@selector(incomeLevel)])
-    return [adWhirlDelegate incomeLevel];
-  return 0;
-}
-
-- (NSString *)city {
-  if([adWhirlDelegate respondsToSelector:@selector(nexageCity)])
-    return [adWhirlDelegate nexageCity];
-  else return nil;
-}
-
-- (NSString *)designatedMarketArea {
-  if([adWhirlDelegate respondsToSelector:@selector(nexageDesignatedMarketArea)])
-    return [adWhirlDelegate nexageDesignatedMarketArea];
-  else return nil;
-}
-
-- (NSString *)country {
-  if([adWhirlDelegate respondsToSelector:@selector(nexageCountry)])
-    return [adWhirlDelegate nexageCountry];
-  else return nil;
-}
-
-- (NSString *)ethnicity {
-  if([adWhirlDelegate respondsToSelector:@selector(nexageEthnicity)])
-    return [adWhirlDelegate nexageEthnicity];
-  else return nil;
-}
-
-- (NSString *)maritalStatus {
-  if([adWhirlDelegate respondsToSelector:@selector(nexageMaritalStatus)])
-    return [adWhirlDelegate nexageMaritalStatus];
-  else return nil;
-}
-
-- (NSString *)areaCode {
-  if([adWhirlDelegate respondsToSelector:@selector(areaCode)])
-    return [adWhirlDelegate areaCode];
-  else return nil;
-}
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterOneRiot.h

@@ -1,30 +0,0 @@
-/*
- 
- AdWhirlAdapterOneRiot.h
- 
- Copyright 2010 OneRiot, Inc.
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
- */
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "OneRiotAd.h"
-
-@interface AdWhirlAdapterOneRiot : AdWhirlAdNetworkAdapter {
-  OneRiotAd *adControl;
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterOneRiot.m

@@ -1,75 +0,0 @@
-/*
- 
- AdWhirlAdapterOneRiot.m
- 
- Copyright 2010 OneRiot, Inc.
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
- */
-
-#import "AdWhirlAdapterOneRiot.h"
-#import "AdWhirlAdNetworkRegistry.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkConfig.h"
-
-@interface AdWhirlAdapterOneRiot ()
-
-@property (nonatomic,retain) OneRiotAd *adControl;
-
-@end
-
-@implementation AdWhirlAdapterOneRiot
-
-@synthesize adControl;
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeOneRiot;
-}
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-- (void)getAd {
-  NSString *appId = networkConfig.pubId;
-  
-  if ([adWhirlDelegate respondsToSelector:@selector(oneRiotAppID)]) {
-    appId = [adWhirlDelegate oneRiotAppID];
-  }
-  
-  adControl = [[OneRiotAd alloc] initWithAppId:appId andWidth:300
-                                 andHeight:50];
-
-  adControl.RefreshInterval = adWhirlConfig.refreshInterval;
-  adControl.ReportGPS = adWhirlConfig.locationOn;
-  
-  if ([adWhirlDelegate
-         respondsToSelector:@selector(oneRiotContextParameters)]) {
-    NSArray* contextParams = [adWhirlDelegate oneRiotContextParameters];
-
-    for (NSString* param in contextParams){
-      [adControl addContextParameters:param];
-    }
-  }
-  [adControl loadAd];
-  self.adNetworkView = adControl;
-}
-
--(void) dealloc {
-  [adControl release];
-  adControl = nil;
-  [super dealloc];
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterQuattro.h

@@ -1,30 +0,0 @@
-/*
-
- AdWhirlAdapterQuattro.h
- 
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
-*/
-
-#import "AdWhirlAdNetworkAdapter.h"
-#import "QWAdView.h"
-
-@interface AdWhirlAdapterQuattro : AdWhirlAdNetworkAdapter <QWAdViewDelegate> {
-
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterQuattro.m

@@ -1,222 +0,0 @@
-/*
-
- AdWhirlAdapterQuattro.m
-
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-*/
-
-#import "AdWhirlAdapterQuattro.h"
-#import "AdWhirlView.h"
-#import "AdWhirlConfig.h"
-#import "AdWhirlAdNetworkConfig.h"
-#import "QWAdView.h"
-#import "QWTestMode.h"
-#import "AdWhirlLog.h"
-#import "AdWhirlAdNetworkAdapter+Helpers.h"
-#import "AdWhirlAdNetworkRegistry.h"
-
-@implementation AdWhirlAdapterQuattro
-
-+ (AdWhirlAdNetworkType)networkType {
-  return AdWhirlAdNetworkTypeQuattro;
-}
-
-+ (void)load {
-  [[AdWhirlAdNetworkRegistry sharedRegistry] registerClass:self];
-}
-
-- (void)getAd {
-  QWEnableLocationServicesForAds(adWhirlConfig.locationOn);
-
-  if ([adWhirlDelegate respondsToSelector:@selector(adWhirlTestMode)]
-      && [adWhirlDelegate adWhirlTestMode]) {
-    QWSetTestMode(YES);
-    QWSetLogging(YES);
-  }
-  else {
-    QWSetTestMode(NO);
-    QWSetLogging(NO);
-  }
-  NSDictionary *credDict;
-  if ([adWhirlDelegate respondsToSelector:@selector(quattroWirelessDictionary)]) {
-    credDict = [adWhirlDelegate quattroWirelessDictionary];
-  }
-  else {
-    credDict = [networkConfig credentials];
-  }
-  NSString *pubId = [credDict objectForKey:@"publisherID"];
-  NSString *siteId = [credDict objectForKey:@"siteID"];
-  QWAdType adType = QWAdTypeBanner;
-  if ([adWhirlDelegate respondsToSelector:@selector(quattroWirelessAdType)]) {
-    adType = (QWAdType)[adWhirlDelegate quattroWirelessAdType];
-  }
-  UIDeviceOrientation orientation;
-  if ([self.adWhirlDelegate respondsToSelector:@selector(adWhirlCurrentOrientation)]) {
-    orientation = [self.adWhirlDelegate adWhirlCurrentOrientation];
-  }
-  else {
-    orientation = [UIDevice currentDevice].orientation;
-  }
-  QWAdView *quattroAd = [QWAdView adViewWithType:adType
-                                     publisherID:pubId
-                                          siteID:siteId
-                                     orientation:orientation
-                                        delegate:self];
-  quattroAd.textColor = [self helperTextColorToUse];
-  quattroAd.backgroundColor = [self helperBackgroundColorToUse];
-  [quattroAd displayNewAd];
-  self.adNetworkView = quattroAd;
-}
-
-- (void)stopBeingDelegate {
-  QWAdView *quattroAd = (QWAdView *)self.adNetworkView;
-  if (quattroAd != nil) {
-    quattroAd.delegate = nil;
-  }
-}
-
-- (void)dealloc {
-  [super dealloc];
-}
-
-#pragma mark QWAdViewDelegate methods
-
-- (void)adView:(QWAdView *)adView didDisplayAd:(QWAd *)ad {
-  // somehow the test banner ad is showing 80 pixels as height sometimes.
-  // check for that and adjust
-  AWLogDebug(@"Quattro reported frame %@", NSStringFromCGRect(self.adNetworkView.frame));
-  if (self.adNetworkView.frame.size.height > 50.0) {
-    CGRect f = adNetworkView.frame;
-    f.size.height = 50;
-    adNetworkView.frame = f;
-  }
-  [adWhirlView adapter:self didReceiveAdView:adView];
-}
-
-- (void)dispatchError:(NSError*)error
-{
-  [adWhirlView adapter:self didFailAd:error];
-}
-
-- (void)adView:(QWAdView *)adView failedWithError:(NSError *)error {
-  [self performSelectorOnMainThread:@selector(dispatchError:) withObject:error waitUntilDone:NO];
-}
-
-- (void)adView:(QWAdView *)adView displayLandingPage:(UIViewController *)controller {
-  [self helperNotifyDelegateOfFullScreenModal];
-  [[adWhirlDelegate viewControllerForPresentingModalView] presentModalViewController:controller
-                                                                            animated:YES];
-}
-
-- (void)adView:(QWAdView *)adView dismiss:(UIViewController *)controller {
-  [[adWhirlDelegate viewControllerForPresentingModalView] dismissModalViewControllerAnimated:YES];
-  [self helperNotifyDelegateOfFullScreenModalDismissal];
-}
-
-#pragma mark QWAdViewDelegate optional methods
-
-- (BOOL)respondsToSelector:(SEL)selector {
-  if (selector == @selector(latitude:)
-      && ![adWhirlDelegate respondsToSelector:@selector(locationInfo)]) {
-    return NO;
-  }
-  else if (selector == @selector(longitude:)
-           && ![adWhirlDelegate respondsToSelector:@selector(locationInfo)]) {
-    return NO;
-  }
-  else if (selector == @selector(age:)
-           && (![adWhirlDelegate respondsToSelector:@selector(dateOfBirth)]
-               || [self age:nil] < 0)) {
-    return NO;
-  }
-  else if (selector == @selector(zipcode:)
-           && ![adWhirlDelegate respondsToSelector:@selector(postalCode)]) {
-    return NO;
-  }
-  else if (selector == @selector(gender:)
-           && ![adWhirlDelegate respondsToSelector:@selector(gender)]) {
-    return NO;
-  }
-  else if (selector == @selector(income:)
-           && ![adWhirlDelegate respondsToSelector:@selector(incomeLevel)]) {
-    return NO;
-  }
-  else if (selector == @selector(education:)
-           && ![adWhirlDelegate respondsToSelector:@selector(quattroWirelessEducationLevel)]) {
-    return NO;
-  }
-  else if (selector == @selector(birthdate:)
-           && ![adWhirlDelegate respondsToSelector:@selector(dateOfBirth)]) {
-    return NO;
-  }
-  else if (selector == @selector(ethnicity:)
-           && ![adWhirlDelegate respondsToSelector:@selector(quattroWirelessEthnicity)]) {
-    return NO;
-  }
-  return [super respondsToSelector:selector];
-}
-
-- (double)latitude:(QWAdView *)adView {
-  CLLocation *loc = [adWhirlDelegate locationInfo];
-  if (loc == nil) return 0.0;
-  return loc.coordinate.latitude;
-}
-
-- (double)longitude:(QWAdView *)adView {
-  CLLocation *loc = [adWhirlDelegate locationInfo];
-  if (loc == nil) return 0.0;
-  return loc.coordinate.longitude;
-}
-
-- (NSString *)zipcode:(QWAdView *)adView {
-  return [adWhirlDelegate postalCode];
-}
-
-- (NSUInteger)age:(QWAdView *)adView {
-  return [self helperCalculateAge];
-}
-
-- (QWGender)gender:(QWAdView *)adView {
-  NSString *gender = [adWhirlDelegate gender];
-  QWGender sex = QWGenderUnknown;
-  if (gender == nil)
-    return sex;
-  if ([gender compare:@"m"] == NSOrderedSame) {
-    sex = QWGenderMale;
-  }
-  else if ([gender compare:@"f"] == NSOrderedSame) {
-    sex = QWGenderFemale;
-  }
-  return sex;
-}
-
-- (NSUInteger)income:(QWAdView *)adView {
-  return [adWhirlDelegate incomeLevel];
-}
-
-- (QWEducationLevel)education:(QWAdView *)adView {
-  return [adWhirlDelegate quattroWirelessEducationLevel];
-}
-
-- (NSDate *)birthdate:(QWAdView *)adView {
-  return [adWhirlDelegate dateOfBirth];
-}
-
-- (QWEthnicity)ethnicity:(QWAdView *)adView {
-  return [adWhirlDelegate quattroWirelessEthnicity];
-}
-
-@end

adwhirl/AdWhirlSDK_iOS_3.1.1/AdWhirl/adapters/AdWhirlAdapterVideoEgg.h

@@ -1,29 +0,0 @@
-/*
-
- AdWhirlAdapterVideoEgg.h
- 
- Copyright 2009 AdMob, Inc.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- 
-*/
-
-#import "AdWhirlAdNetworkAdapter.h"
-
-@interface AdWhirlAdapterVideoEgg : AdWhirlAdNetworkAdapter {
-
-}
-
-+ (AdWhirlAdNetworkType)networkType;
-
-@end