diff --git a/.travis.yml b/.travis.yml index 4490d3c6c..109530950 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_install: - export ANDROID="android-sdk-linux/tools/android" install: - sudo apt-get update -qq -- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch mingw32-qt; fi +- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download - tar -x --xz -f sdk.lzma - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv diff --git a/JGE/src/pc/JGfx.cpp b/JGE/src/pc/JGfx.cpp index ea71b167c..093e2035e 100644 --- a/JGE/src/pc/JGfx.cpp +++ b/JGE/src/pc/JGfx.cpp @@ -2486,7 +2486,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 diff --git a/JGE/src/qt/corewrapper.cpp b/JGE/src/qt/corewrapper.cpp index 656a35132..7a2313a58 100644 --- a/JGE/src/qt/corewrapper.cpp +++ b/JGE/src/qt/corewrapper.cpp @@ -335,7 +335,7 @@ void WagicCore::resizeGL(int width, int height) #if (defined GL_VERSION_ES_CM_1_1 || defined GL_OES_VERSION_1_1) glOrthof(0.0f, (float) (m_viewPort.right()-m_viewPort.left())-1.0f, 0.0f, (float) (m_viewPort.bottom()-m_viewPort.top())-1.0f, -1.0f, 1.0f); #else - gluOrtho2D(0.0f, (float) (m_viewPort.right()-m_viewPort.left())-1.0f, 0.0f, (float) (m_viewPort.bottom()-m_viewPort.top())-1.0f); + glOrtho(0.0f, (float) (m_viewPort.right()-m_viewPort.left())-1.0f, 0.0f, (float) (m_viewPort.bottom()-m_viewPort.top())-1.0f, -1.0f, 1.0f); #endif glMatrixMode (GL_MODELVIEW); // Select The Modelview Matrix diff --git a/projects/mtg/wagic-SDL.pro b/projects/mtg/wagic-SDL.pro index a1580106d..0855c80e5 100644 --- a/projects/mtg/wagic-SDL.pro +++ b/projects/mtg/wagic-SDL.pro @@ -1,39 +1,19 @@ #------------------------------------------------- +#------------------------------------------------- + +include(wagic.pri) + +DEFINES += SDL_CONFIG # # Project created by QtCreator 2010-06-30T19:48:30 # -#------------------------------------------------- +QT -= core gui opengl network declarative -#QT += core gui opengl network -macx:QT += phonon -#CONFIG += warn_off precompile_header // causes some massives errors on mac. -VERSION = 0.14.1 -TARGET = wagic -TEMPLATE = app -unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter -windows:DEFINES += WIN32 -windows:DEFINES += _CRT_SECURE_NO_WARNINGS -unix|macx:DEFINES += LINUX -CONFIG(debug, debug|release):DEFINES += _DEBUG -#DEFINES += QT_CONFIG -#DEFINES += NETWORK_SUPPORT -DEFINES += SDL_CONFIG -DEFINES += TIXML_USE_STL -macx:DEFINES += USE_PHONON -maemo5: { -DEFINES += USE_PHONON -QT += phonon dbus -} -windows:INCLUDEPATH += ../../JGE/Dependencies/include -windows:INCLUDEPATH += ../../JGE/Dependencies/SDL/include -windows:INCLUDEPATH += extra +unix|windows:QMAKE_CXXFLAGS += -std=c++11 + +INCLUDEPATH += ../../JGE/Dependencies/SDL/include unix:INCLUDEPATH += /usr/include/GL unix:INCLUDEPATH += /usr/local/include/SDL -macx:INCLUDEPATH += /opt/include -INCLUDEPATH += ../../JGE/include -INCLUDEPATH += ../../JGE/src/zipFS -INCLUDEPATH += ../../Boost -INCLUDEPATH += include OBJECTS_DIR = objs MOC_DIR = objs DESTDIR = bin @@ -42,358 +22,246 @@ macx|unix:LIBS += -lz -lboost_thread-mt unix:LIBS += -ljpeg -lgif -lpng12 -L/usr/local/lib -lGL -lGLU -lSDL windows:LIBS += -L../../JGE/Dependencies/lib -L../../Boost/lib -llibjpeg-static-mt-debug -lgiflib -llibpng -lfmodvc -PRECOMPILED_HEADER = include/PrecompiledHeader.h - -# MGT -SOURCES += \ - src/AbilityParser.cpp\ - src/ActionElement.cpp\ - src/ActionLayer.cpp\ - src/ActionStack.cpp\ - src/AIHints.cpp\ - src/AIMomirPlayer.cpp\ - src/AIPlayer.cpp\ - src/AIPlayerBaka.cpp\ - src/AIStats.cpp\ - src/AllAbilities.cpp\ - src/CardDescriptor.cpp\ - src/CardDisplay.cpp\ - src/CardEffect.cpp\ - src/CardGui.cpp\ - src/CardPrimitive.cpp\ - src/CardSelector.cpp\ - src/CardSelectorSingleton.cpp\ - src/Closest.cpp\ - src/Counters.cpp\ - src/Credits.cpp\ - src/Damage.cpp\ - src/DamagerDamaged.cpp\ - src/DeckDataWrapper.cpp\ - src/DeckEditorMenu.cpp\ - src/DeckManager.cpp\ - src/DeckMenu.cpp\ - src/DeckMenuItem.cpp\ - src/DeckMetaData.cpp\ - src/DeckStats.cpp\ - src/DuelLayers.cpp\ - src/Effects.cpp\ - src/ExtraCost.cpp\ - src/GameApp.cpp\ - src/GameLauncher.cpp\ - src/GameObserver.cpp\ - src/GameOptions.cpp\ - src/GameStateAwards.cpp\ - src/GameState.cpp\ - src/GameStateDeckViewer.cpp\ - src/GameStateDuel.cpp\ - src/GameStateMenu.cpp\ - src/GameStateOptions.cpp\ - src/GameStateShop.cpp\ - src/GameStateStory.cpp\ - src/GameStateTransitions.cpp\ - src/GuiAvatars.cpp\ - src/GuiBackground.cpp\ - src/GuiCardsController.cpp\ - src/GuiCombat.cpp\ - src/GuiFrame.cpp\ - src/GuiHand.cpp\ - src/GuiLayers.cpp\ - src/GuiMana.cpp\ - src/GuiPhaseBar.cpp\ - src/GuiPlay.cpp\ - src/GuiStatic.cpp\ - src/IconButton.cpp\ - src/ManaCost.cpp\ - src/ManaCostHybrid.cpp\ - src/MenuItem.cpp\ - src/ModRules.cpp\ - src/MTGAbility.cpp\ - src/MTGCard.cpp\ - src/MTGCardInstance.cpp\ - src/MTGDeck.cpp\ - src/MTGDefinitions.cpp\ - src/MTGGamePhase.cpp\ - src/MTGGameZones.cpp\ - src/MTGPack.cpp\ - src/MTGRules.cpp\ - src/ObjectAnalytics.cpp\ - src/OptionItem.cpp\ - src/PhaseRing.cpp\ - src/Player.cpp\ - src/PlayerData.cpp\ - src/PlayGuiObject.cpp\ - src/PlayGuiObjectController.cpp\ - src/PlayRestrictions.cpp\ - src/Pos.cpp\ - src/PriceList.cpp\ - src/ReplacementEffects.cpp\ - src/Rules.cpp\ - src/SimpleMenu.cpp\ - src/SimpleMenuItem.cpp\ - src/SimplePad.cpp\ - src/SimplePopup.cpp\ - src/StoryFlow.cpp\ - src/Subtypes.cpp\ - src/StyleManager.cpp\ - src/TargetChooser.cpp\ - src/TargetsList.cpp\ - src/Tasks.cpp\ - src/TextScroller.cpp\ - src/ThisDescriptor.cpp\ - src/Token.cpp\ - src/Translate.cpp\ - src/TranslateKeys.cpp\ - src/Trash.cpp\ - src/utils.cpp\ - src/WCachedResource.cpp\ - src/WDataSrc.cpp\ - src/WEvent.cpp\ - src/WFilter.cpp\ - src/WFont.cpp\ - src/WGui.cpp\ - src/WResourceManager.cpp\ - src/NetworkPlayer.cpp - CONFIG(debug, debug|release):SOURCES += src/TestSuiteAI.cpp -HEADERS += \ - include/AllAbilities.h\ - include/DeckMenu.h\ - include/DeckMenuItem.h\ - include/ExtraCost.h\ - include/ManaCost.h\ - include/SimpleMenuItem.h\ - include/GameApp.h\ - include/ManaCostHybrid.h\ - include/SimplePad.h\ - include/ActionElement.h\ - include/GameObserver.h\ - include/MenuItem.h\ - include/StoryFlow.h\ - include/ActionLayer.h\ - include/GameOptions.h\ - include/MTGAbility.h\ - include/Subtypes.h\ - include/ActionStack.h\ - include/GameStateAwards.h\ - include/MTGCard.h\ - include/AIMomirPlayer.h\ - include/GameStateDeckViewer.h\ - include/MTGCardInstance.h\ - include/Targetable.h\ - include/AIPlayer.h\ - include/GameStateDuel.h\ - include/MTGDeck.h\ - include/TargetChooser.h\ - include/AIStats.h\ - include/GameState.h\ - include/MTGDefinitions.h\ - include/TargetsList.h\ - include/AllAbilities.h\ - include/GameStateMenu.h\ - include/MTGGamePhase.h\ - include/Tasks.h\ - include/CardDescriptor.h\ - include/GameStateOptions.h\ - include/MTGGameZones.h\ - include/TestSuiteAI.h\ - include/CardDisplay.h\ - include/GameStateShop.h\ - include/MTGPack.h\ - include/TextScroller.h\ - include/CardEffect.h\ - include/GameStateStory.h\ - include/MTGRules.h\ - include/ThisDescriptor.h\ - include/CardGui.h\ - include/GameStateTransitions.h\ - include/IconButton.h\ - include/OptionItem.h\ - include/Token.h\ - include/CardPrimitive.h\ - include/GuiAvatars.h\ - include/OSD.h\ - include/Translate.h\ - include/CardSelector.h\ - include/CardSelectorSingleton.h\ - include/GuiBackground.h\ - include/PhaseRing.h\ - include/TranslateKeys.h\ - include/config.h\ - include/GuiCardsController.h\ - include/PlayerData.h\ - include/Trash.h\ - include/Counters.h\ - include/GuiCombat.h\ - include/Player.h\ - include/utils.h\ - include/Credits.h\ - include/GuiFrame.h\ - include/PlayGuiObjectController.h\ - include/WCachedResource.h\ - include/Damage.h\ - include/GuiHand.h\ - include/PlayGuiObject.h\ - include/WDataSrc.h\ - include/DamagerDamaged.h\ - include/GuiLayers.h\ - include/Pos.h\ - include/WEvent.h\ - include/DeckDataWrapper.h\ - include/GuiMana.h\ - include/PriceList.h\ - include/WFilter.h\ - include/DeckMetaData.h\ - include/GuiPhaseBar.h\ - include/ReplacementEffects.h\ - include/WGui.h\ - include/DeckStats.h\ - include/GuiPlay.h\ - include/Rules.h\ - include/WResourceManager.h\ - include/DuelLayers.h\ - include/GuiStatic.h\ - include/Effects.h\ - include/StyleManager.h\ - include/WFont.h\ - include/DeckManager.h\ - include/SimplePopup.h\ - include/SimpleMenu.h\ - include/PrecompiledHeader.h\ - include/Navigator.h\ - include/DeckEditorMenu.h\ - include/PlayRestrictions.h\ - include/NetworkPlayer.h\ - include/ModRules.h\ - include/AIHints.h\ - # JGE, could probably be moved outside SOURCES += \ ../../JGE/src/SDLmain.cpp\ - ../../JGE/src/Encoding.cpp\ - ../../JGE/src/JAnimator.cpp\ - ../../JGE/src/JApp.cpp\ - ../../JGE/src/JDistortionMesh.cpp\ - ../../JGE/src/JFileSystem.cpp\ - ../../JGE/src/JGameObject.cpp\ - ../../JGE/src/JGE.cpp\ - ../../JGE/src/JGui.cpp\ - ../../JGE/src/JLogger.cpp\ - ../../JGE/src/JLBFont.cpp\ - ../../JGE/src/JMD2Model.cpp\ - ../../JGE/src/JOBJModel.cpp\ - ../../JGE/src/JParticle.cpp\ - ../../JGE/src/JParticleEffect.cpp\ - ../../JGE/src/JParticleEmitter.cpp\ - ../../JGE/src/JParticleSystem.cpp\ - ../../JGE/src/JResourceManager.cpp\ - ../../JGE/src/JSpline.cpp\ - ../../JGE/src/JSprite.cpp\ - ../../JGE/src/Vector2D.cpp\ - ../../JGE/src/tinyxml/tinystr.cpp\ - ../../JGE/src/tinyxml/tinyxml.cpp\ - ../../JGE/src/tinyxml/tinyxmlerror.cpp\ - ../../JGE/src/tinyxml/tinyxmlparser.cpp\ - ../../JGE/src/hge/hgecolor.cpp\ - ../../JGE/src/hge/hgedistort.cpp\ - ../../JGE/src/hge/hgefont.cpp\ - ../../JGE/src/hge/hgeparticle.cpp\ - ../../JGE/src/hge/hgerect.cpp\ - ../../JGE/src/hge/hgevector.cpp\ - ../../JGE/src/zipFS/zfsystem.cpp\ - ../../JGE/src/zipFS/ziphdr.cpp\ - ../../JGE/src/zipFS/zstream.cpp\ - ../../JGE/src/pc/JSfx.cpp\ - ../../JGE/src/pc/JGfx.cpp\ - ../../JGE/src/JNetwork.cpp\ - ../../JGE/src/pc/JSocket.cpp + ../../JGE/src/JMD2Model.cpp -HEADERS += \ - ../../JGE/include/decoder_prx.h\ - ../../JGE/include/DebugRoutines.h\ - ../../JGE/include/Encoding.h\ - ../../JGE/include/JAnimator.h\ - ../../JGE/include/JApp.h\ - ../../JGE/include/JAssert.h\ - ../../JGE/include/JCooleyesMP3.h\ - ../../JGE/include/JDistortionMesh.h\ - ../../JGE/include/JFileSystem.h\ - ../../JGE/include/JGameLauncher.h\ - ../../JGE/include/JGameObject.h\ - ../../JGE/include/JGE.h\ - ../../JGE/include/JGui.h\ - ../../JGE/include/JLBFont.h\ - ../../JGE/include/JLogger.h\ - ../../JGE/include/JMD2Model.h\ - ../../JGE/include/JMP3.h\ - ../../JGE/include/JNetwork.h\ - ../../JGE/include/JOBJModel.h\ - ../../JGE/include/JParticleEffect.h\ - ../../JGE/include/JParticleEmitter.h\ - ../../JGE/include/JParticle.h\ - ../../JGE/include/JParticleSystem.h\ - ../../JGE/include/JRenderer.h\ - ../../JGE/include/JResourceManager.h\ - ../../JGE/include/JSocket.h\ - ../../JGE/include/JSoundSystem.h\ - ../../JGE/include/JSpline.h\ - ../../JGE/include/JSprite.h\ - ../../JGE/include/JTypes.h\ - ../../JGE/include/Vector2D.h\ - ../../JGE/include/Vector3D.h\ - ../../JGE/include/vram.h\ - ../../JGE/include/Threading.h\ - ../../JGE/src/tinyxml/tinystr.h\ - ../../JGE/src/tinyxml/tinyxml.h\ - ../../JGE/include/vram.h\ - ../../JGE/include/hge/hgecolor.h\ - ../../JGE/include/hge/hgedistort.h\ - ../../JGE/include/hge/hgefont.h\ - ../../JGE/include/hge/hgerect.h\ - ../../JGE/include/hge/hgevector.h\ - ../../JGE/include/hge/hgeparticle.h\ - ../../JGE/include/unzip/ioapi.h\ - ../../JGE/include/unzip/mztools.h\ - ../../JGE/include/unzip/unzip.h\ - ../../JGE/include/JNetwork.h\ - ../../JGE/include/JSocket.h +windows{ - INSTALLS += target \ - res \ + SOURCES += \ + ../../JGE/Dependencies/SDL/src/core/windows/SDL_windows.c\ + ../../JGE/Dependencies/SDL/src/events/SDL_clipboardevents.c\ + ../../JGE/Dependencies/SDL/src/events/SDL_gesture.c\ + ../../JGE/Dependencies/SDL/src/events/SDL_touch.c\ + ../../JGE/Dependencies/SDL/src/libm/e_atan2.c\ + ../../JGE/Dependencies/SDL/src/libm/e_log.c\ + ../../JGE/Dependencies/SDL/src/libm/e_pow.c\ + ../../JGE/Dependencies/SDL/src/libm/e_rem_pio2.c\ + ../../JGE/Dependencies/SDL/src/libm/e_sqrt.c\ + ../../JGE/Dependencies/SDL/src/libm/k_cos.c\ + ../../JGE/Dependencies/SDL/src/libm/k_rem_pio2.c\ + ../../JGE/Dependencies/SDL/src/libm/k_sin.c\ + ../../JGE/Dependencies/SDL/src/libm/s_atan.c\ + ../../JGE/Dependencies/SDL/src/libm/s_copysign.c\ + ../../JGE/Dependencies/SDL/src/libm/s_cos.c\ + ../../JGE/Dependencies/SDL/src/libm/s_fabs.c\ + ../../JGE/Dependencies/SDL/src/libm/s_floor.c\ + ../../JGE/Dependencies/SDL/src/libm/s_scalbn.c\ + ../../JGE/Dependencies/SDL/src/libm/s_sin.c\ + ../../JGE/Dependencies/SDL/src/render/direct3d/SDL_render_d3d.c\ + ../../JGE/Dependencies/SDL/src/render/opengl/SDL_render_gl.c\ + ../../JGE/Dependencies/SDL/src/render/opengl/SDL_shaders_gl.c\ + ../../JGE/Dependencies/SDL/src/render/SDL_render.c\ + ../../JGE/Dependencies/SDL/src/render/SDL_yuv_mmx.c\ + ../../JGE/Dependencies/SDL/src/render/SDL_yuv_sw.c\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_blendfillrect.c\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_blendline.c\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_blendpoint.c\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_drawline.c\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_drawpoint.c\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_render_sw.c\ + ../../JGE/Dependencies/SDL/src/SDL.c\ + ../../JGE/Dependencies/SDL/src/SDL_assert.c\ + ../../JGE/Dependencies/SDL/src/atomic/SDL_atomic.c\ + ../../JGE/Dependencies/SDL/src/atomic/SDL_spinlock.c\ + ../../JGE/Dependencies/SDL/src/audio/SDL_audio.c\ + ../../JGE/Dependencies/SDL/src/audio/SDL_audiocvt.c\ + ../../JGE/Dependencies/SDL/src/audio/SDL_audiodev.c\ + ../../JGE/Dependencies/SDL/src/audio/SDL_audiotypecvt.c\ + ../../JGE/Dependencies/SDL/src/SDL_hints.c\ + ../../JGE/Dependencies/SDL/src/SDL_log.c\ + ../../JGE/Dependencies/SDL/src/video/dummy/SDL_nullframebuffer.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_0.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_1.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_A.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_auto.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_copy.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_N.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_slow.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_bmp.c\ + ../../JGE/Dependencies/SDL/src/SDL_compat.c\ + ../../JGE/Dependencies/SDL/src/cpuinfo/SDL_cpuinfo.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_clipboard.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_shape.c\ + ../../JGE/Dependencies/SDL/src/audio/windib/SDL_dibaudio.c\ + ../../JGE/Dependencies/SDL/src/audio/disk/SDL_diskaudio.c\ + ../../JGE/Dependencies/SDL/src/audio/dummy/SDL_dummyaudio.c\ + ../../JGE/Dependencies/SDL/src/audio/windx5/SDL_dx5audio.c\ + ../../JGE/Dependencies/SDL/src/joystick/windows/SDL_dxjoystick.c\ + ../../JGE/Dependencies/SDL/src/SDL_error.c\ + ../../JGE/Dependencies/SDL/src/events/SDL_events.c\ + ../../JGE/Dependencies/SDL/src/SDL_fatal.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_fillrect.c\ + ../../JGE/Dependencies/SDL/src/stdlib/SDL_getenv.c\ + ../../JGE/Dependencies/SDL/src/haptic/SDL_haptic.c\ + ../../JGE/Dependencies/SDL/src/stdlib/SDL_iconv.c\ + ../../JGE/Dependencies/SDL/src/joystick/SDL_joystick.c\ + ../../JGE/Dependencies/SDL/src/events/SDL_keyboard.c\ + ../../JGE/Dependencies/SDL/src/stdlib/SDL_malloc.c\ + ../../JGE/Dependencies/SDL/src/audio/SDL_mixer.c\ + ../../JGE/Dependencies/SDL/src/joystick/windows/SDL_mmjoystick.c\ + ../../JGE/Dependencies/SDL/src/events/SDL_mouse.c\ + ../../JGE/Dependencies/SDL/src/video/dummy/SDL_nullevents.c\ + ../../JGE/Dependencies/SDL/src/video/dummy/SDL_nullvideo.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_pixels.c\ + ../../JGE/Dependencies/SDL/src/power/SDL_power.c\ + ../../JGE/Dependencies/SDL/src/stdlib/SDL_qsort.c\ + ../../JGE/Dependencies/SDL/src/events/SDL_quit.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_rect.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_RLEaccel.c\ + ../../JGE/Dependencies/SDL/src/file/SDL_rwops.c\ + ../../JGE/Dependencies/SDL/src/stdlib/SDL_stdlib.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_stretch.c\ + ../../JGE/Dependencies/SDL/src/stdlib/SDL_string.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_surface.c\ + ../../JGE/Dependencies/SDL/src/haptic/windows/SDL_syshaptic.c\ + ../../JGE/Dependencies/SDL/src/loadso/windows/SDL_sysloadso.c\ + ../../JGE/Dependencies/SDL/src/thread/windows/SDL_sysmutex.c\ + ../../JGE/Dependencies/SDL/src/power/windows/SDL_syspower.c\ + ../../JGE/Dependencies/SDL/src/thread/windows/SDL_syssem.c\ + ../../JGE/Dependencies/SDL/src/thread/windows/SDL_systhread.c\ + ../../JGE/Dependencies/SDL/src/timer/windows/SDL_systimer.c\ + ../../JGE/Dependencies/SDL/src/thread/SDL_thread.c\ + ../../JGE/Dependencies/SDL/src/timer/SDL_timer.c\ + ../../JGE/Dependencies/SDL/src/video/SDL_video.c\ + ../../JGE/Dependencies/SDL/src/audio/SDL_wave.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsclipboard.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsevents.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsframebuffer.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowskeyboard.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsmodes.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsmouse.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsopengl.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsshape.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsvideo.c\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowswindow.c\ + ../../JGE/Dependencies/SDL/src/events/SDL_windowevents.c - res.path = /usr/local/bin/Res - res.files += bin/Res/* - target.path = /usr/local/bin -maemo5: { - # Variables - BINDIR = /opt/wagic - RESDIR = /home/user/wagic/Res - ICONDIR = /usr/share - DEFINES += RESDIR=\\\"$$RESDIR\\\" + HEADERS += \ + ../../JGE/Dependencies/SDL/include/SDL.h\ + ../../JGE/Dependencies/SDL/include/SDL_assert.h\ + ../../JGE/Dependencies/SDL/include/SDL_atomic.h\ + ../../JGE/Dependencies/SDL/include/SDL_audio.h\ + ../../JGE/Dependencies/SDL/include/SDL_blendmode.h\ + ../../JGE/Dependencies/SDL/include/SDL_clipboard.h\ + ../../JGE/Dependencies/SDL/include/SDL_compat.h\ + ../../JGE/Dependencies/SDL/include/SDL_config.h\ + ../../JGE/Dependencies/SDL/include/SDL_config_windows.h\ + ../../JGE/Dependencies/SDL/include/SDL_copying.h\ + ../../JGE/Dependencies/SDL/include/SDL_cpuinfo.h\ + ../../JGE/Dependencies/SDL/include/SDL_endian.h\ + ../../JGE/Dependencies/SDL/include/SDL_error.h\ + ../../JGE/Dependencies/SDL/include/SDL_events.h\ + ../../JGE/Dependencies/SDL/include/SDL_gesture.h\ + ../../JGE/Dependencies/SDL/include/SDL_haptic.h\ + ../../JGE/Dependencies/SDL/include/SDL_hints.h\ + ../../JGE/Dependencies/SDL/include/SDL_input.h\ + ../../JGE/Dependencies/SDL/include/SDL_joystick.h\ + ../../JGE/Dependencies/SDL/include/SDL_keyboard.h\ + ../../JGE/Dependencies/SDL/include/SDL_keycode.h\ + ../../JGE/Dependencies/SDL/include/SDL_loadso.h\ + ../../JGE/Dependencies/SDL/include/SDL_log.h\ + ../../JGE/Dependencies/SDL/include/SDL_main.h\ + ../../JGE/Dependencies/SDL/include/SDL_mouse.h\ + ../../JGE/Dependencies/SDL/include/SDL_mutex.h\ + ../../JGE/Dependencies/SDL/include/SDL_name.h\ + ../../JGE/Dependencies/SDL/include/SDL_opengl.h\ + ../../JGE/Dependencies/SDL/include/SDL_opengles.h\ + ../../JGE/Dependencies/SDL/include/SDL_pixels.h\ + ../../JGE/Dependencies/SDL/include/SDL_platform.h\ + ../../JGE/Dependencies/SDL/include/SDL_power.h\ + ../../JGE/Dependencies/SDL/include/SDL_quit.h\ + ../../JGE/Dependencies/SDL/include/SDL_rect.h\ + ../../JGE/Dependencies/SDL/include/SDL_render.h\ + ../../JGE/Dependencies/SDL/include/SDL_revision.h\ + ../../JGE/Dependencies/SDL/include/SDL_rwops.h\ + ../../JGE/Dependencies/SDL/include/SDL_scancode.h\ + ../../JGE/Dependencies/SDL/include/SDL_shape.h\ + ../../JGE/Dependencies/SDL/include/SDL_stdinc.h\ + ../../JGE/Dependencies/SDL/include/SDL_surface.h\ + ../../JGE/Dependencies/SDL/include/SDL_syswm.h\ + ../../JGE/Dependencies/SDL/include/SDL_thread.h\ + ../../JGE/Dependencies/SDL/include/SDL_timer.h\ + ../../JGE/Dependencies/SDL/include/SDL_touch.h\ + ../../JGE/Dependencies/SDL/include/SDL_types.h\ + ../../JGE/Dependencies/SDL/include/SDL_version.h\ + ../../JGE/Dependencies/SDL/include/SDL_video.h\ + ../../JGE/Dependencies/SDL/src/core/windows/SDL_windows.h\ + ../../JGE/Dependencies/SDL/src/events/blank_cursor.h\ + ../../JGE/Dependencies/SDL/src/events/default_cursor.h\ + ../../JGE/Dependencies/SDL/src/audio/windx5\directx.h\ + ../../JGE/Dependencies/SDL/src/events/SDL_clipboardevents_c.h\ + ../../JGE/Dependencies/SDL/src/events/SDL_gesture_c.h\ + ../../JGE/Dependencies/SDL/src/events/SDL_touch_c.h\ + ../../JGE/Dependencies/SDL/src/libm/math.h\ + ../../JGE/Dependencies/SDL/src/libm/math_private.h\ + ../../JGE/Dependencies/SDL/src/render/mmx.h\ + ../../JGE/Dependencies/SDL/src/render/opengl\SDL_shaders_gl.h\ + ../../JGE/Dependencies/SDL/src/render/SDL_sysrender.h\ + ../../JGE/Dependencies/SDL/src/render/SDL_yuv_sw_c.h\ + ../../JGE/Dependencies/SDL/src/audio/SDL_audio_c.h\ + ../../JGE/Dependencies/SDL/src/audio/SDL_audiodev_c.h\ + ../../JGE/Dependencies/SDL/src/audio/SDL_audiomem.h\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_blendfillrect.h\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_blendline.h\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_blendpoint.h\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_draw.h\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_drawline.h\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_drawpoint.h\ + ../../JGE/Dependencies/SDL/src/render/software/SDL_render_sw_c.h\ + ../../JGE/Dependencies/SDL/src/video/dummy/SDL_nullframebuffer_c.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_auto.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_copy.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_blit_slow.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_shape_internals.h\ + ../../JGE/Dependencies/SDL/src/audio/windib/SDL_dibaudio.h\ + ../../JGE/Dependencies/SDL/src/audio/disk/SDL_diskaudio.h\ + ../../JGE/Dependencies/SDL/src/audio/dummy/SDL_dummyaudio.h\ + ../../JGE/Dependencies/SDL/src/audio/windx5/SDL_dx5audio.h\ + ../../JGE/Dependencies/SDL/src/SDL_error_c.h\ + ../../JGE/Dependencies/SDL/src/events/SDL_events_c.h\ + ../../JGE/Dependencies/SDL/src/SDL_fatal.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_glesfuncs.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_glfuncs.h\ + ../../JGE/Dependencies/SDL/src/joystick/SDL_joystick_c.h\ + ../../JGE/Dependencies/SDL/src/events/SDL_keyboard_c.h\ + ../../JGE/Dependencies/SDL/src/events/SDL_mouse_c.h\ + ../../JGE/Dependencies/SDL/src/video/dummy/SDL_nullevents_c.h\ + ../../JGE/Dependencies/SDL/src/video/dummy/SDL_nullvideo.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_pixels_c.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_rect_c.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_RLEaccel_c.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_stretch_c.h\ + ../../JGE/Dependencies/SDL/src/audio/SDL_sysaudio.h\ + ../../JGE/Dependencies/SDL/src/events/SDL_sysevents.h\ + ../../JGE/Dependencies/SDL/src/haptic/SDL_syshaptic.h\ + ../../JGE/Dependencies/SDL/src/joystick/SDL_sysjoystick.h\ + ../../JGE/Dependencies/SDL/src/thread/SDL_systhread.h\ + ../../JGE/Dependencies/SDL/src/thread/windows\SDL_systhread_c.h\ + ../../JGE/Dependencies/SDL/src/timer/SDL_systimer.h\ + ../../JGE/Dependencies/SDL/src/video/SDL_sysvideo.h\ + ../../JGE/Dependencies/SDL/src/thread/SDL_thread_c.h\ + ../../JGE/Dependencies/SDL/src/timer/SDL_timer_c.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_vkeys.h\ + ../../JGE/Dependencies/SDL/src/audio/SDL_wave.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsclipboard.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsevents.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsframebuffer.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowskeyboard.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsmodes.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsmouse.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsopengl.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsshape.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowsvideo.h\ + ../../JGE/Dependencies/SDL/src/video/windows/SDL_windowswindow.h\ + ../../JGE/Dependencies/SDL/src/events/SDL_windowevents_c.h\ + ../../JGE/Dependencies/SDL/src/video/windows/wmmsg.h\ + ../../JGE/Dependencies/SDL/VisualC/SDL/resource.h - INSTALLS += target \ - desktop \ - icon \ - res \ - restxt \ - launcher \ - - target.path = $$BINDIR - - desktop.path = $$ICONDIR/applications/hildon - desktop.files += wagic.desktop - - icon.path = $$ICONDIR/icons/hicolor/64x64/apps - icon.files += wagic-64x64.png - - res.path = $$RESDIR - res.files += bin/Res/* - # res.extra = tar -C ../../../../src/projects/mtg/bin -czf Res.tgz Res - - restxt.path = $$BINDIR - restxt.files += debian/Res.txt - - launcher.path = $$BINDIR - launcher.files += debian/launcher } diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index 3084f5f32..40c1eede5 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -1,5 +1,9 @@ +include(wagic.pri) + # Add more folders to ship with the application, here addExclusiveBuilds(graphics, Graphics, console, Console) + +INCLUDEPATH += ../../JGE/include/qt CONFIG(console, graphics|console){ QT += core network QT -= gui @@ -14,345 +18,35 @@ else:CONFIG(graphics, graphics|console){ folder_01.target = /usr/share DEPLOYMENTFOLDERS = folder_01 QT += core gui opengl network + QT -= declarative quick qml #maemo5:DEFINES += QT_WIDGET DEFINES += QT_WIDGET unix:!symbian:INCLUDEPATH += /usr/include/GL # Please do not modify the following two lines. Required for deployment. - !maemo5:include(qml/qmlapplicationviewer/qmlapplicationviewer.pri) - !maemo5:qtcAddDeployment() +# !maemo5:include(qml/qmlapplicationviewer/qmlapplicationviewer.pri) +# !maemo5:qtcAddDeployment() } #!android:!symbian:QT += phonon maemo5:QT += dbus -TARGET = wagic -TEMPLATE = app - -#!macx:CONFIG += precompile_header -unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter -unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter -unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable -unix|macx:QMAKE_CXXFLAGS += -Wno-unused-value -unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs -unix:!macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror - -windows:DEFINES += _CRT_SECURE_NO_WARNINGS -unix|macx:DEFINES += LINUX -CONFIG(debug, debug|release) { - DEFINES += _DEBUG -} - DEFINES += QT_CONFIG #!android:!symbian:DEFINES += USE_PHONON android:INCLUDEPATH += $$ANDROID_NDK_ROOT/platforms/android-9/arch-arm/usr/include #DEFINES += QT_NO_DEBUG_OUTPUT -DEFINES += NETWORK_SUPPORT - -DEFINES += TIXML_USE_STL - -windows:INCLUDEPATH += ../../JGE/Dependencies/include -windows{ - *-g++* { - DEFINES += LINUX - } - *-msvc* { - INCLUDEPATH += extra - DEFINES += WIN32 - } -} -macx:INCLUDEPATH += /opt/include -INCLUDEPATH += ../../JGE/include/qt -INCLUDEPATH += ../../JGE/include -INCLUDEPATH += ../../JGE/src/zipFS -INCLUDEPATH += ../../Boost -INCLUDEPATH += include -#!symbian:DESTDIR = bin - -unix:!symbian:LIBS += -lz -win32:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib -win32:LIBS += ../../JGE/Dependencies/lib/zlibd.lib -PRECOMPILED_HEADER = include/PrecompiledHeader.h - -#DEFINES += TRACK_OBJECT_USAGE -#DEFINES += AI_CHANGE_TESTING -#DEFINES += ACTION_LOGGING_TESTING - -SOURCES += \ - src/AbilityParser.cpp\ - src/ActionElement.cpp\ - src/ActionLayer.cpp\ - src/ActionStack.cpp\ - src/AIHints.cpp\ - src/AIMomirPlayer.cpp\ - src/AIPlayer.cpp\ - src/AIPlayerBaka.cpp\ - src/AIStats.cpp\ - src/AllAbilities.cpp\ - src/CardDescriptor.cpp\ - src/CardDisplay.cpp\ - src/CardGui.cpp\ - src/CardPrimitive.cpp\ - src/CardSelector.cpp\ - src/Closest.cpp\ - src/Counters.cpp\ - src/Credits.cpp\ - src/Damage.cpp\ - src/DamagerDamaged.cpp\ - src/DeckDataWrapper.cpp\ - src/DeckEditorMenu.cpp\ - src/DeckManager.cpp\ - src/DeckMenu.cpp\ - src/DeckMenuItem.cpp\ - src/DeckMetaData.cpp\ - src/DeckStats.cpp\ - src/DuelLayers.cpp\ - src/Effects.cpp\ - src/ExtraCost.cpp\ - src/GameApp.cpp\ - src/GameLauncher.cpp\ - src/GameObserver.cpp\ - src/GameOptions.cpp\ - src/GameStateAwards.cpp\ - src/GameState.cpp\ - src/GameStateDeckViewer.cpp\ - src/GameStateDuel.cpp\ - src/GameStateMenu.cpp\ - src/GameStateOptions.cpp\ - src/GameStateShop.cpp\ - src/GameStateStory.cpp\ - src/GameStateTransitions.cpp\ - src/GuiAvatars.cpp\ - src/GuiBackground.cpp\ - src/GuiCardsController.cpp\ - src/GuiCombat.cpp\ - src/GuiFrame.cpp\ - src/GuiHand.cpp\ - src/GuiLayers.cpp\ - src/GuiMana.cpp\ - src/GuiPhaseBar.cpp\ - src/GuiPlay.cpp\ - src/GuiStatic.cpp\ - src/IconButton.cpp\ - src/InteractiveButton.cpp\ - src/ManaCost.cpp\ - src/ManaCostHybrid.cpp\ - src/MenuItem.cpp\ - src/ModRules.cpp\ - src/MTGAbility.cpp\ - src/MTGCard.cpp\ - src/MTGCardInstance.cpp\ - src/MTGDeck.cpp\ - src/MTGDefinitions.cpp\ - src/MTGGamePhase.cpp\ - src/MTGGameZones.cpp\ - src/MTGPack.cpp\ - src/MTGRules.cpp\ - src/ObjectAnalytics.cpp\ - src/OptionItem.cpp\ - src/PhaseRing.cpp\ - src/Player.cpp\ - src/PlayerData.cpp\ - src/PlayGuiObject.cpp\ - src/PlayGuiObjectController.cpp\ - src/PlayRestrictions.cpp\ - src/Pos.cpp\ - src/PriceList.cpp\ - src/ReplacementEffects.cpp\ - src/Rules.cpp\ - src/SimpleButton.cpp\ - src/SimpleMenu.cpp\ - src/SimpleMenuItem.cpp\ - src/SimplePad.cpp\ - src/SimplePopup.cpp\ - src/StoryFlow.cpp\ - src/Subtypes.cpp\ - src/StyleManager.cpp\ - src/TargetChooser.cpp\ - src/TargetsList.cpp\ - src/Tasks.cpp\ - src/TextScroller.cpp\ - src/ThisDescriptor.cpp\ - src/Token.cpp\ - src/Translate.cpp\ - src/TranslateKeys.cpp\ - src/Trash.cpp\ - src/utils.cpp\ - src/WCachedResource.cpp\ - src/WDataSrc.cpp\ - src/WEvent.cpp\ - src/WFilter.cpp\ - src/WFont.cpp\ - src/WGui.cpp\ - src/WResourceManager.cpp \ - src/AIPlayerBakaB.cpp \ - src/TestSuiteAI.cpp - -HEADERS += \ - include/CacheEngine.h\ - include/AllAbilities.h\ - include/AbilityParser.h\ - include/PrecompiledHeader.h\ - include/WResource_Fwd.h\ - include/PlayRestrictions.h\ - include/ModRules.h\ - include/AIHints.h\ - include/AIPlayerBaka.h\ - include/AIPlayerBakaB.h\ - include/DeckEditorMenu.h\ - include/WResourceManagerImpl.h\ - include/DeckMenu.h\ - include/DeckMenuItem.h\ - include/ExtraCost.h\ - include/ManaCost.h\ - include/SimpleMenuItem.h\ - include/GameApp.h\ - include/ManaCostHybrid.h\ - include/SimplePad.h\ - include/ActionElement.h\ - include/GameObserver.h\ - include/MenuItem.h\ - include/StoryFlow.h\ - include/ActionLayer.h\ - include/GameOptions.h\ - include/MTGAbility.h\ - include/Subtypes.h\ - include/ActionStack.h\ - include/GameStateAwards.h\ - include/MTGCard.h\ - include/AIMomirPlayer.h\ - include/GameStateDeckViewer.h\ - include/MTGCardInstance.h\ - include/Targetable.h\ - include/AIPlayer.h\ - include/GameStateDuel.h\ - include/MTGDeck.h\ - include/TargetChooser.h\ - include/AIStats.h\ - include/GameState.h\ - include/MTGDefinitions.h\ - include/TargetsList.h\ - include/AllAbilities.h\ - include/GameStateMenu.h\ - include/MTGGamePhase.h\ - include/Tasks.h\ - include/CardDescriptor.h\ - include/GameStateOptions.h\ - include/MTGGameZones.h\ - include/TestSuiteAI.h\ - include/CardDisplay.h\ - include/GameStateShop.h\ - include/MTGPack.h\ - include/TextScroller.h\ - include/GameStateStory.h\ - include/MTGRules.h\ - include/ThisDescriptor.h\ - include/CardGui.h\ - include/GameStateTransitions.h\ - include/IconButton.h\ - include/OptionItem.h\ - include/Token.h\ - include/CardPrimitive.h\ - include/GuiAvatars.h\ - include/Translate.h\ - include/CardSelector.h\ - include/GuiBackground.h\ - include/PhaseRing.h\ - include/TranslateKeys.h\ - include/config.h\ - include/GuiCardsController.h\ - include/PlayerData.h\ - include/Trash.h\ - include/Counters.h\ - include/GuiCombat.h\ - include/Player.h\ - include/utils.h\ - include/Credits.h\ - include/GuiFrame.h\ - include/PlayGuiObjectController.h\ - include/WCachedResource.h\ - include/Damage.h\ - include/GuiHand.h\ - include/PlayGuiObject.h\ - include/WDataSrc.h\ - include/DamagerDamaged.h\ - include/GuiLayers.h\ - include/Pos.h\ - include/WEvent.h\ - include/DeckDataWrapper.h\ - include/GuiMana.h\ - include/PriceList.h\ - include/WFilter.h\ - include/DeckMetaData.h\ - include/GuiPhaseBar.h\ - include/ReplacementEffects.h\ - include/WGui.h\ - include/DeckStats.h\ - include/GuiPlay.h\ - include/Rules.h\ - include/WResourceManager.h\ - include/DuelLayers.h\ - include/GuiStatic.h\ - include/Effects.h\ - include/StyleManager.h\ - include/WFont.h\ - include/DeckManager.h\ - include/SimplePopup.h\ - include/SimpleMenu.h\ - include/SimpleButton.h\ - include/InteractiveButton.h\ - include/ObjectAnalytics.h - -# JGE, could probably be moved outside -SOURCES += \ - ../../JGE/src/Encoding.cpp\ - ../../JGE/src/JAnimator.cpp\ - ../../JGE/src/JApp.cpp\ - ../../JGE/src/JDistortionMesh.cpp\ - ../../JGE/src/JFileSystem.cpp\ - ../../JGE/src/JGameObject.cpp\ - ../../JGE/src/JGE.cpp\ - ../../JGE/src/JGui.cpp\ - ../../JGE/src/JLogger.cpp\ - ../../JGE/src/JLBFont.cpp\ - ../../JGE/src/JOBJModel.cpp\ - ../../JGE/src/JParticle.cpp\ - ../../JGE/src/JParticleEffect.cpp\ - ../../JGE/src/JParticleEmitter.cpp\ - ../../JGE/src/JParticleSystem.cpp\ - ../../JGE/src/JResourceManager.cpp\ - ../../JGE/src/JSpline.cpp\ - ../../JGE/src/JNetwork.cpp\ - ../../JGE/src/pc/JSocket.cpp\ - ../../JGE/src/pc/JSfx.cpp\ - ../../JGE/src/JSprite.cpp\ - ../../JGE/src/OutputCapturer.cpp\ - ../../JGE/src/Vector2D.cpp\ - ../../JGE/src/tinyxml/tinystr.cpp\ - ../../JGE/src/tinyxml/tinyxml.cpp\ - ../../JGE/src/tinyxml/tinyxmlerror.cpp\ - ../../JGE/src/tinyxml/tinyxmlparser.cpp\ - ../../JGE/src/hge/hgecolor.cpp\ - ../../JGE/src/hge/hgedistort.cpp\ - ../../JGE/src/hge/hgefont.cpp\ - ../../JGE/src/hge/hgeparticle.cpp\ - ../../JGE/src/hge/hgerect.cpp\ - ../../JGE/src/hge/hgevector.cpp\ - ../../JGE/src/zipFS/zfsystem.cpp\ - ../../JGE/src/zipFS/ziphdr.cpp\ - ../../JGE/src/zipFS/zstream.cpp CONFIG(graphics, graphics|console){ + HEADERS += \ + ../../JGE/include/qt/filedownloader.h\ + ../../JGE/include/qt/corewrapper.h + SOURCES += \ ../../JGE/src/qt/filedownloader.cpp\ ../../JGE/src/qt/corewrapper.cpp\ ../../JGE/src/Qtmain.cpp\ ../../JGE/src/JMD2Model.cpp\ ../../JGE/src/pc/JGfx.cpp - - HEADERS += \ - ../../JGE/include/qt/filedownloader.h\ - ../../JGE/include/qt/corewrapper.h } else:CONFIG(console, graphics|console){ SOURCES += \ @@ -360,61 +54,6 @@ else:CONFIG(console, graphics|console){ ../../JGE/src/Qtconsole.cpp } - -HEADERS += \ - ../../JGE/include/Threading.h\ - ../../JGE/include/decoder_prx.h\ - ../../JGE/include/DebugRoutines.h\ - ../../JGE/include/Encoding.h\ - ../../JGE/include/JAnimator.h\ - ../../JGE/include/JApp.h\ - ../../JGE/include/JAssert.h\ - ../../JGE/include/JCooleyesMP3.h\ - ../../JGE/include/JDistortionMesh.h\ - ../../JGE/include/JFileSystem.h\ - ../../JGE/include/JGameLauncher.h\ - ../../JGE/include/JGameObject.h\ - ../../JGE/include/JGE.h\ - ../../JGE/include/JGui.h\ - ../../JGE/include/JLBFont.h\ - ../../JGE/include/JLogger.h\ - ../../JGE/include/JMD2Model.h\ - ../../JGE/include/JMP3.h\ - ../../JGE/include/JNetwork.h\ - ../../JGE/include/JOBJModel.h\ - ../../JGE/include/JParticleEffect.h\ - ../../JGE/include/JParticleEmitter.h\ - ../../JGE/include/JParticle.h\ - ../../JGE/include/JParticleSystem.h\ - ../../JGE/include/JRenderer.h\ - ../../JGE/include/JResourceManager.h\ - ../../JGE/include/JSocket.h\ - ../../JGE/include/JSoundSystem.h\ - ../../JGE/include/JSpline.h\ - ../../JGE/include/JSprite.h\ - ../../JGE/include/JTypes.h\ - ../../JGE/include/OutputCapturer.h\ - ../../JGE/include/Vector2D.h\ - ../../JGE/include/Vector3D.h\ - ../../JGE/include/vram.h\ - ../../JGE/include/hge/hgecolor.h\ - ../../JGE/include/hge/hgedistort.h\ - ../../JGE/include/hge/hgefont.h\ - ../../JGE/include/hge/hgeparticle.h\ - ../../JGE/include/hge/hgerect.h\ - ../../JGE/include/hge/hgevector.h\ - ../../JGE/src/unzip/unzip.h\ - ../../JGE/src/unzip/ioapi.h\ - ../../JGE/src/zipFS/zstream_zlib.h\ - ../../JGE/src/zipFS/zfsystem.h\ - ../../JGE/src/zipFS/zstream.h\ - ../../JGE/src/zipFS/ziphdr.h\ - ../../JGE/src/zipFS/stdafx.h\ - ../../JGE/src/zipFS/fileio.h\ - ../../JGE/src/tinyxml/tinystr.h\ - ../../JGE/src/tinyxml/tinyxml.h\ - ../../JGE/include/vram.h - # maemo 5 packaging maemo5: { # Variables diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri new file mode 100644 index 000000000..f5b4563eb --- /dev/null +++ b/projects/mtg/wagic.pri @@ -0,0 +1,474 @@ +# Add more folders to ship with the application, here +TARGET = wagic +TEMPLATE = app + +#!macx:CONFIG += precompile_header +unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter +unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter +unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable +unix|macx:QMAKE_CXXFLAGS += -Wno-unused-value +unix:!macx:QMAKE_CXXFLAGS += -Wno-unused-local-typedefs +unix:!macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror + +windows:DEFINES += _CRT_SECURE_NO_WARNINGS +unix|macx:DEFINES += LINUX +CONFIG(debug, debug|release) { + DEFINES += _DEBUG +} + +DEFINES += NETWORK_SUPPORT +DEFINES += TIXML_USE_STL + +windows:INCLUDEPATH += ../../JGE/Dependencies/include +windows{ + *-g++* { + DEFINES += LINUX + INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/Qt +# INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/c++ + LIBS += -L/usr/i686-w64-mingw32/sys-root/mingw/lib + LIBS += -lwsock32 + } + *-msvc* { + INCLUDEPATH += extra + DEFINES += WIN32 + } +} +macx:INCLUDEPATH += /opt/include +INCLUDEPATH += ../../JGE/include +INCLUDEPATH += ../../JGE/src/zipFS +INCLUDEPATH += ../../Boost +INCLUDEPATH += include + +unix:!symbian:LIBS += -lz +win32:LIBS += ../../JGE/Dependencies/lib/fmodvc.lib +win32:LIBS += ../../JGE/Dependencies/lib/zlibd.lib +PRECOMPILED_HEADER = include/PrecompiledHeader.h + +#DEFINES += TRACK_OBJECT_USAGE +#DEFINES += AI_CHANGE_TESTING +#DEFINES += ACTION_LOGGING_TESTING + +SOURCES += \ + src/AbilityParser.cpp\ + src/ActionElement.cpp\ + src/ActionLayer.cpp\ + src/ActionStack.cpp\ + src/AIHints.cpp\ + src/AIMomirPlayer.cpp\ + src/AIPlayer.cpp\ + src/AIPlayerBaka.cpp\ + src/AIStats.cpp\ + src/AllAbilities.cpp\ + src/CardDescriptor.cpp\ + src/CardDisplay.cpp\ + src/CardGui.cpp\ + src/CardPrimitive.cpp\ + src/CardSelector.cpp\ + src/Closest.cpp\ + src/Counters.cpp\ + src/Credits.cpp\ + src/Damage.cpp\ + src/DamagerDamaged.cpp\ + src/DeckDataWrapper.cpp\ + src/DeckEditorMenu.cpp\ + src/DeckManager.cpp\ + src/DeckMenu.cpp\ + src/DeckMenuItem.cpp\ + src/DeckMetaData.cpp\ + src/DeckStats.cpp\ + src/DuelLayers.cpp\ + src/Effects.cpp\ + src/ExtraCost.cpp\ + src/GameApp.cpp\ + src/GameLauncher.cpp\ + src/GameObserver.cpp\ + src/GameOptions.cpp\ + src/GameStateAwards.cpp\ + src/GameState.cpp\ + src/GameStateDeckViewer.cpp\ + src/GameStateDuel.cpp\ + src/GameStateMenu.cpp\ + src/GameStateOptions.cpp\ + src/GameStateShop.cpp\ + src/GameStateStory.cpp\ + src/GameStateTransitions.cpp\ + src/GuiAvatars.cpp\ + src/GuiBackground.cpp\ + src/GuiCardsController.cpp\ + src/GuiCombat.cpp\ + src/GuiFrame.cpp\ + src/GuiHand.cpp\ + src/GuiLayers.cpp\ + src/GuiMana.cpp\ + src/GuiPhaseBar.cpp\ + src/GuiPlay.cpp\ + src/GuiStatic.cpp\ + src/IconButton.cpp\ + src/InteractiveButton.cpp\ + src/ManaCost.cpp\ + src/ManaCostHybrid.cpp\ + src/MenuItem.cpp\ + src/ModRules.cpp\ + src/MTGAbility.cpp\ + src/MTGCard.cpp\ + src/MTGCardInstance.cpp\ + src/MTGDeck.cpp\ + src/MTGDefinitions.cpp\ + src/MTGGamePhase.cpp\ + src/MTGGameZones.cpp\ + src/MTGPack.cpp\ + src/MTGRules.cpp\ + src/ObjectAnalytics.cpp\ + src/OptionItem.cpp\ + src/PhaseRing.cpp\ + src/Player.cpp\ + src/PlayerData.cpp\ + src/PlayGuiObject.cpp\ + src/PlayGuiObjectController.cpp\ + src/PlayRestrictions.cpp\ + src/Pos.cpp\ + src/PriceList.cpp\ + src/ReplacementEffects.cpp\ + src/Rules.cpp\ + src/SimpleButton.cpp\ + src/SimpleMenu.cpp\ + src/SimpleMenuItem.cpp\ + src/SimplePad.cpp\ + src/SimplePopup.cpp\ + src/StoryFlow.cpp\ + src/Subtypes.cpp\ + src/StyleManager.cpp\ + src/TargetChooser.cpp\ + src/TargetsList.cpp\ + src/Tasks.cpp\ + src/TextScroller.cpp\ + src/ThisDescriptor.cpp\ + src/Token.cpp\ + src/Translate.cpp\ + src/TranslateKeys.cpp\ + src/Trash.cpp\ + src/utils.cpp\ + src/WCachedResource.cpp\ + src/WDataSrc.cpp\ + src/WEvent.cpp\ + src/WFilter.cpp\ + src/WFont.cpp\ + src/WGui.cpp\ + src/WResourceManager.cpp \ + src/AIPlayerBakaB.cpp \ + src/TestSuiteAI.cpp + +HEADERS += \ + include/CacheEngine.h\ + include/AllAbilities.h\ + include/AbilityParser.h\ + include/PrecompiledHeader.h\ + include/WResource_Fwd.h\ + include/PlayRestrictions.h\ + include/ModRules.h\ + include/AIHints.h\ + include/AIPlayerBaka.h\ + include/AIPlayerBakaB.h\ + include/DeckEditorMenu.h\ + include/WResourceManagerImpl.h\ + include/DeckMenu.h\ + include/DeckMenuItem.h\ + include/ExtraCost.h\ + include/ManaCost.h\ + include/SimpleMenuItem.h\ + include/GameApp.h\ + include/ManaCostHybrid.h\ + include/SimplePad.h\ + include/ActionElement.h\ + include/GameObserver.h\ + include/MenuItem.h\ + include/StoryFlow.h\ + include/ActionLayer.h\ + include/GameOptions.h\ + include/MTGAbility.h\ + include/Subtypes.h\ + include/ActionStack.h\ + include/GameStateAwards.h\ + include/MTGCard.h\ + include/AIMomirPlayer.h\ + include/GameStateDeckViewer.h\ + include/MTGCardInstance.h\ + include/Targetable.h\ + include/AIPlayer.h\ + include/GameStateDuel.h\ + include/MTGDeck.h\ + include/TargetChooser.h\ + include/AIStats.h\ + include/GameState.h\ + include/MTGDefinitions.h\ + include/TargetsList.h\ + include/AllAbilities.h\ + include/GameStateMenu.h\ + include/MTGGamePhase.h\ + include/Tasks.h\ + include/CardDescriptor.h\ + include/GameStateOptions.h\ + include/MTGGameZones.h\ + include/TestSuiteAI.h\ + include/CardDisplay.h\ + include/GameStateShop.h\ + include/MTGPack.h\ + include/TextScroller.h\ + include/GameStateStory.h\ + include/MTGRules.h\ + include/ThisDescriptor.h\ + include/CardGui.h\ + include/GameStateTransitions.h\ + include/IconButton.h\ + include/OptionItem.h\ + include/Token.h\ + include/CardPrimitive.h\ + include/GuiAvatars.h\ + include/Translate.h\ + include/CardSelector.h\ + include/GuiBackground.h\ + include/PhaseRing.h\ + include/TranslateKeys.h\ + include/config.h\ + include/GuiCardsController.h\ + include/PlayerData.h\ + include/Trash.h\ + include/Counters.h\ + include/GuiCombat.h\ + include/Player.h\ + include/utils.h\ + include/Credits.h\ + include/GuiFrame.h\ + include/PlayGuiObjectController.h\ + include/WCachedResource.h\ + include/Damage.h\ + include/GuiHand.h\ + include/PlayGuiObject.h\ + include/WDataSrc.h\ + include/DamagerDamaged.h\ + include/GuiLayers.h\ + include/Pos.h\ + include/WEvent.h\ + include/DeckDataWrapper.h\ + include/GuiMana.h\ + include/PriceList.h\ + include/WFilter.h\ + include/DeckMetaData.h\ + include/GuiPhaseBar.h\ + include/ReplacementEffects.h\ + include/WGui.h\ + include/DeckStats.h\ + include/GuiPlay.h\ + include/Rules.h\ + include/WResourceManager.h\ + include/DuelLayers.h\ + include/GuiStatic.h\ + include/Effects.h\ + include/StyleManager.h\ + include/WFont.h\ + include/DeckManager.h\ + include/SimplePopup.h\ + include/SimpleMenu.h\ + include/SimpleButton.h\ + include/InteractiveButton.h\ + include/ObjectAnalytics.h + +# JGE, could probably be moved outside +SOURCES += \ + ../../JGE/src/Encoding.cpp\ + ../../JGE/src/JAnimator.cpp\ + ../../JGE/src/JApp.cpp\ + ../../JGE/src/JDistortionMesh.cpp\ + ../../JGE/src/JFileSystem.cpp\ + ../../JGE/src/JGameObject.cpp\ + ../../JGE/src/JGE.cpp\ + ../../JGE/src/JGui.cpp\ + ../../JGE/src/JLogger.cpp\ + ../../JGE/src/JLBFont.cpp\ + ../../JGE/src/JOBJModel.cpp\ + ../../JGE/src/JParticle.cpp\ + ../../JGE/src/JParticleEffect.cpp\ + ../../JGE/src/JParticleEmitter.cpp\ + ../../JGE/src/JParticleSystem.cpp\ + ../../JGE/src/JResourceManager.cpp\ + ../../JGE/src/JSpline.cpp\ + ../../JGE/src/JNetwork.cpp\ + ../../JGE/src/pc/JSocket.cpp\ + ../../JGE/src/pc/JSfx.cpp\ + ../../JGE/src/JSprite.cpp\ + ../../JGE/src/OutputCapturer.cpp\ + ../../JGE/src/Vector2D.cpp\ + ../../JGE/src/tinyxml/tinystr.cpp\ + ../../JGE/src/tinyxml/tinyxml.cpp\ + ../../JGE/src/tinyxml/tinyxmlerror.cpp\ + ../../JGE/src/tinyxml/tinyxmlparser.cpp\ + ../../JGE/src/hge/hgecolor.cpp\ + ../../JGE/src/hge/hgedistort.cpp\ + ../../JGE/src/hge/hgefont.cpp\ + ../../JGE/src/hge/hgeparticle.cpp\ + ../../JGE/src/hge/hgerect.cpp\ + ../../JGE/src/hge/hgevector.cpp\ + ../../JGE/src/zipFS/zfsystem.cpp\ + ../../JGE/src/zipFS/ziphdr.cpp\ + ../../JGE/src/zipFS/zstream.cpp + +HEADERS += \ + ../../JGE/include/Threading.h\ + ../../JGE/include/decoder_prx.h\ + ../../JGE/include/DebugRoutines.h\ + ../../JGE/include/Encoding.h\ + ../../JGE/include/JAnimator.h\ + ../../JGE/include/JApp.h\ + ../../JGE/include/JAssert.h\ + ../../JGE/include/JCooleyesMP3.h\ + ../../JGE/include/JDistortionMesh.h\ + ../../JGE/include/JFileSystem.h\ + ../../JGE/include/JGameLauncher.h\ + ../../JGE/include/JGameObject.h\ + ../../JGE/include/JGE.h\ + ../../JGE/include/JGui.h\ + ../../JGE/include/JLBFont.h\ + ../../JGE/include/JLogger.h\ + ../../JGE/include/JMD2Model.h\ + ../../JGE/include/JMP3.h\ + ../../JGE/include/JNetwork.h\ + ../../JGE/include/JOBJModel.h\ + ../../JGE/include/JParticleEffect.h\ + ../../JGE/include/JParticleEmitter.h\ + ../../JGE/include/JParticle.h\ + ../../JGE/include/JParticleSystem.h\ + ../../JGE/include/JRenderer.h\ + ../../JGE/include/JResourceManager.h\ + ../../JGE/include/JSocket.h\ + ../../JGE/include/JSoundSystem.h\ + ../../JGE/include/JSpline.h\ + ../../JGE/include/JSprite.h\ + ../../JGE/include/JTypes.h\ + ../../JGE/include/OutputCapturer.h\ + ../../JGE/include/Vector2D.h\ + ../../JGE/include/Vector3D.h\ + ../../JGE/include/vram.h\ + ../../JGE/include/hge/hgecolor.h\ + ../../JGE/include/hge/hgedistort.h\ + ../../JGE/include/hge/hgefont.h\ + ../../JGE/include/hge/hgeparticle.h\ + ../../JGE/include/hge/hgerect.h\ + ../../JGE/include/hge/hgevector.h\ + ../../JGE/src/unzip/unzip.h\ + ../../JGE/src/unzip/ioapi.h\ + ../../JGE/src/zipFS/zstream_zlib.h\ + ../../JGE/src/zipFS/zfsystem.h\ + ../../JGE/src/zipFS/zstream.h\ + ../../JGE/src/zipFS/ziphdr.h\ + ../../JGE/src/zipFS/stdafx.h\ + ../../JGE/src/zipFS/fileio.h\ + ../../JGE/src/tinyxml/tinystr.h\ + ../../JGE/src/tinyxml/tinyxml.h\ + ../../JGE/include/vram.h + +# maemo 5 packaging +maemo5: { + # Variables + BINDIR = /opt/wagic/bin + RESDIR = /home/user/wagic/Res + USERDIR = MyDocs/.Wagic + ICONDIR = /usr/share + + DEFINES += RESDIR=\\\"$$RESDIR\\\" + DEFINES += USERDIR=\\\"$$USERDIR\\\" + + INSTALLS += target \ + desktop \ + icon + + target.path = $$BINDIR + + desktop.path = $$ICONDIR/applications/hildon + desktop.files += wagic.desktop + + icon.path = $$ICONDIR/icons/hicolor/64x64/apps + icon.files += wagic-64x64.png + +# Meego/maemo 6 packaging (no launcher) +} else:contains(MEEGO_EDITION,harmattan): { + # Variables + BINDIR = /opt/wagic/bin + RESDIR = /opt/wagic/Res + USERDIR = MyDocs/.Wagic + ICONDIR = /usr/share + + DEFINES += RESDIR=\\\"$$RESDIR\\\" + DEFINES += USERDIR=\\\"$$USERDIR\\\" + + INSTALLS += target \ + desktop \ + icon \ + policy + + target.path = $$BINDIR + + desktop.path = /usr/share/applications + desktop.files += debian_harmattan/wagic.desktop + + icon.files = wagic-80x80.png + icon.path = /usr/share/icons/hicolor/64x64/apps + + policy.files = debian_harmattan/wagic.conf + policy.path = /usr/share/policy/etc/syspart.conf.d + +} else:symbian { + TARGET.UID3 = 0xE1D807D3 + + # Smart Installer package's UID + # This UID is from the protected range + # and therefore the package will fail to install if self-signed + # By default qmake uses the unprotected range value if unprotected UID is defined for the application + # and 0x2002CCCF value if protected UID is given to the application + #symbian:DEPLOYMENT.installer_header = 0x2002CCCF + + # Allow network access on Symbian... that's probably pointless + TARGET.CAPABILITY += NetworkServices + + RESDIR = some/res/dir + USERDIR = .Wagic + DEFINES += RESDIR=\"$$RESDIR\" + DEFINES += USERDIR=\"$$USERDIR\" + ICON = wagic.svg +} else:android { + DEFINES += Q_WS_ANDROID + RESDIR = Res + USERDIR = /sdcard/Wagic/Res + DEFINES += RESDIR=\\\"$$RESDIR\\\" + DEFINES += USERDIR=\\\"$$USERDIR\\\" +} else:unix { + # Variables + BINDIR = /usr/bin + ICONDIR = /usr/share + RESDIR = Res + USERDIR = .Wagic + + DEFINES += RESDIR=\\\"$$RESDIR\\\" + DEFINES += USERDIR=\\\"$$USERDIR\\\" + + target.path = $$BINDIR + + desktop.path = $$ICONDIR/applications + desktop.files += wagic.desktop + + icon.path = $$ICONDIR/icons/hicolor/64x64/apps + icon.files += wagic-64x64.png + + INSTALLS += target \ + desktop \ + icon + +} else:windows { + RESDIR = ./Res + USERDIR = .Wagic + DEFINES += RESDIR=\\\"$$RESDIR\\\" + DEFINES += USERDIR=\\\"$$USERDIR\\\" +} + + + +