diff --git a/android/app/build.gradle b/android/app/build.gradle index 0f181058cb..09855867dc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -14,10 +14,13 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + externalNativeBuild { cmake { - cppFlags '-std=c++20', '-fuse-ld=lld', '-flto' - arguments "-DVCPKG_TARGET_ANDROID=ON", "-DANDROID_STL=c++_shared" + cppFlags '-std=c++20', '-flto' + arguments "-DVCPKG_TARGET_ANDROID=ON", + "-DANDROID_STL=c++_shared" + abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' } } } @@ -25,7 +28,7 @@ android { externalNativeBuild { cmake { path file('../../CMakeLists.txt') - version '3.31.1' + version '4.0.2' } } @@ -51,20 +54,12 @@ android { prefab true } - ndkVersion '28.0.12674087' - - defaultConfig { - externalNativeBuild { - cmake { - abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' - } - } - } + ndkVersion '29.0.13599879 rc2' } dependencies { - implementation 'androidx.core:core-ktx:1.10.1' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.games:games-activity:1.2.1' - implementation 'com.google.android.material:material:1.10.0' -} \ No newline at end of file + implementation 'androidx.core:core-ktx:1.16.0' + implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'androidx.games:games-activity:4.0.0' + implementation 'com.google.android.material:material:1.12.0' +} diff --git a/android/build.gradle b/android/build.gradle index e565c3d0e2..ccb1d784b3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,10 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.7.3' apply false - id 'com.android.library' version '8.7.3' apply false + id 'com.android.application' version '8.10.1' apply false + id 'com.android.library' version '8.10.1' apply false id 'org.jetbrains.kotlin.android' version '1.9.23' apply false } task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/android/gradle.properties b/android/gradle.properties index 46718e4fd4..d4253bf865 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -23,4 +23,3 @@ kotlin.code.style=official android.nonTransitiveRClass=true # Enables experimental Prefab android.prefabVersion=2.0.0 -android.useGoldLinker=false \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 09523c0e54..6797f2d682 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Thu Jul 03 00:40:37 BRT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 36ac194649..e7bac59979 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,8 +5,8 @@ project(otclient) # Options # ***************************************************************************** if(CMAKE_BASE_NAME STREQUAL "em++") - set(WASM ON) - message(STATUS "WASM: ON") + set(WASM ON) + message(STATUS "WASM: ON") endif() option(TOGGLE_FRAMEWORK_GRAPHICS "Use Graphics " ON) @@ -42,11 +42,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # Client # ***************************************************************************** if (MSVC) - add_executable(${PROJECT_NAME} "" ../cmake/icon/otcicon.rc) + add_executable(${PROJECT_NAME} "" ../cmake/icon/otcicon.rc) elseif(ANDROID) - add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES}) + add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES}) else() - add_executable(${PROJECT_NAME} "") + add_executable(${PROJECT_NAME} "") endif() # ***************************************************************************** @@ -56,38 +56,38 @@ endif() # Define Framework options for use in compilation set(FRAMEWORK_DEFINITIONS "") if (TOGGLE_FRAMEWORK_GRAPHICS) - set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_GRAPHICS) + set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_GRAPHICS) endif() if (TOGGLE_FRAMEWORK_SOUND) - set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_SOUND) + set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_SOUND) endif() if (TOGGLE_FRAMEWORK_XML) - set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_XML) + set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_XML) endif() if (TOGGLE_FRAMEWORK_NET) - set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_NET) + set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_NET) endif() if (TOGGLE_FRAMEWORK_EDITOR) - set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_EDITOR) + set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DFRAMEWORK_EDITOR) endif() if (ANDROID OR WASM) - set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DOPENGL_ES=2) + set(FRAMEWORK_DEFINITIONS ${FRAMEWORK_DEFINITIONS} -DOPENGL_ES=2) endif() # Set for use precompiled header if(TOGGLE_PRE_COMPILED_HEADER) - # === PRECOMPILED HEADER === - target_precompile_headers(${PROJECT_NAME} PRIVATE framework/pch.h) - message(STATUS "Use precompiled header: ON") + # === PRECOMPILED HEADER === + target_precompile_headers(${PROJECT_NAME} PRIVATE framework/pch.h) + message(STATUS "Use precompiled header: ON") else() - message(STATUS "Use precompiled header: OFF") + message(STATUS "Use precompiled header: OFF") endif(TOGGLE_PRE_COMPILED_HEADER) # === UNITY BUILD (compile time reducer) === if(SPEED_UP_BUILD_UNITY) - set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD ON) - log_option_enabled("Build unity for speed up compilation") + set_target_properties(${PROJECT_NAME} PROPERTIES UNITY_BUILD ON) + log_option_enabled("Build unity for speed up compilation") endif(SPEED_UP_BUILD_UNITY) set(VERSION "1.0.0") @@ -96,17 +96,17 @@ set(VERSION "1.0.0") # Build flags # ***************************************************************************** if (NOT MSVC) - if (CMAKE_COMPILER_IS_GNUCXX) - target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-declarations) - endif() + if (CMAKE_COMPILER_IS_GNUCXX) + target_compile_options(${PROJECT_NAME} PRIVATE -Wno-deprecated-declarations) + endif() endif() if(THREADS_HAVE_PTHREAD_ARG) - target_compile_options(${PROJECT_NAME} PUBLIC "-pthread") + target_compile_options(${PROJECT_NAME} PUBLIC "-pthread") endif() if(CMAKE_BUILD_TYPE STREQUAL "Release") - add_definitions(-DNDEBUG) + add_definitions(-DNDEBUG) endif() # ***************************************************************************** @@ -116,28 +116,28 @@ endif() # === ASAN === if(ASAN_ENABLED) - log_option_enabled("asan") - - if(MSVC) - string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - target_compile_options(${PROJECT_NAME} PUBLIC /fsanitize=address) - target_link_options(${PROJECT_NAME} PUBLIC /fsanitize=address) - else() - target_compile_options(${PROJECT_NAME} PUBLIC -fsanitize=address) - target_link_options(${PROJECT_NAME} PUBLIC -fsanitize=address) - endif() + log_option_enabled("asan") + + if(MSVC) + string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + target_compile_options(${PROJECT_NAME} PUBLIC /fsanitize=address) + target_link_options(${PROJECT_NAME} PUBLIC /fsanitize=address) + else() + target_compile_options(${PROJECT_NAME} PUBLIC -fsanitize=address) + target_link_options(${PROJECT_NAME} PUBLIC -fsanitize=address) + endif() else() - log_option_disabled("asan") + log_option_disabled("asan") endif() # === DEBUG LOG === # cmake -DDEBUG_LOG=ON .. if(CMAKE_BUILD_TYPE MATCHES Debug) - target_compile_definitions(${PROJECT_NAME} PRIVATE -DDEBUG_LOG=ON ) - log_option_enabled("DEBUG LOG") - else() - log_option_disabled("DEBUG LOG") + target_compile_definitions(${PROJECT_NAME} PRIVATE -DDEBUG_LOG=ON ) + log_option_enabled("DEBUG LOG") +else() + log_option_disabled("DEBUG LOG") endif(CMAKE_BUILD_TYPE MATCHES Debug) # ***************************************************************************** @@ -146,19 +146,19 @@ endif(CMAKE_BUILD_TYPE MATCHES Debug) # === GCC Minimum Version === if (CMAKE_COMPILER_IS_GNUCXX) - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNUCXX_MINIMUM_VERSION) - message(FATAL_ERROR "GCC version must be at least ${GNUCXX_MINIMUM_VERSION}!") - endif() + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNUCXX_MINIMUM_VERSION) + message(FATAL_ERROR "GCC version must be at least ${GNUCXX_MINIMUM_VERSION}!") + endif() endif() # Multiprocessor compiller if(CMake_MSVC_PARALLEL) - if(CMake_MSVC_PARALLEL GREATER 0) - add_definitions(/MP${CMake_MSVC_PARALLEL}) - else() - add_definitions(/MP) - endif() + if(CMake_MSVC_PARALLEL GREATER 0) + add_definitions(/MP${CMake_MSVC_PARALLEL}) + else() + add_definitions(/MP) + endif() endif() @@ -195,239 +195,239 @@ find_package(httplib CONFIG REQUIRED) find_package(fmt CONFIG REQUIRED) if(APPLE) - # Required for Physfs - find_library(FOUNDATION Foundation REQUIRED) - find_library(IOKIT IOKit REQUIRED) + # Required for Physfs + find_library(FOUNDATION Foundation REQUIRED) + find_library(IOKIT IOKit REQUIRED) endif() if(UNIX AND NOT ANDROID AND NOT WASM) - find_package(X11 REQUIRED) + find_package(X11 REQUIRED) endif() if(WIN32) - find_package(DbgHelp REQUIRED) + find_package(DbgHelp REQUIRED) endif(WIN32) if(NOT OPENSSL_FOUND) - find_package(GMP REQUIRED) + find_package(GMP REQUIRED) endif() if(TOGGLE_DIRECTX) - find_package(DirectX REQUIRED) + find_package(DirectX REQUIRED) endif() if(TOGGLE_FRAMEWORK_SOUND) - if(NOT WASM) - find_package(OpenAL CONFIG REQUIRED) - endif() - find_package(VorbisFile REQUIRED) - find_package(Vorbis CONFIG REQUIRED) - find_package(Ogg CONFIG REQUIRED) + if(NOT WASM) + find_package(OpenAL CONFIG REQUIRED) + endif() + find_package(VorbisFile REQUIRED) + find_package(Vorbis CONFIG REQUIRED) + find_package(Ogg CONFIG REQUIRED) endif() if(ANDROID) - set(LUA_LIBRARY ${LUA_LIBRARY} ${Android_LIBRARIES}/liblua.a) - set(LUAJIT_INCLUDE_DIR ${LUAJIT_LIBRARY} ${Android_INCLUDES}/luajit) - set(LUAJIT_LIBRARY ${LUAJIT_LIBRARY} ${Android_LIBRARIES}/libluajit.a) - set(OpenAL_LIBRARY ${OpenAL_LIBRARY} ${Android_LIBRARIES}/libopenal.a) - set(MINIZIP_INCLUDE_DIR ${MINIZIP_INCLUDE_DIR} ${Android_INCLUDES}/minizip) - set(MINIZIP_LIBRARY ${MINIZIP_LIBRARY} ${Android_LIBRARIES}/libminizip.a) - find_package(game-activity REQUIRED CONFIG) - find_package(EGL REQUIRED) + set(LUA_LIBRARY ${LUA_LIBRARY} ${Android_LIBRARIES}/liblua.a) + set(LUAJIT_INCLUDE_DIR ${LUAJIT_LIBRARY} ${Android_INCLUDES}/luajit) + set(LUAJIT_LIBRARY ${LUAJIT_LIBRARY} ${Android_LIBRARIES}/libluajit.a) + set(OpenAL_LIBRARY ${OpenAL_LIBRARY} ${Android_LIBRARIES}/libopenal.a) + set(MINIZIP_INCLUDE_DIR ${MINIZIP_INCLUDE_DIR} ${Android_INCLUDES}/minizip) + set(MINIZIP_LIBRARY ${MINIZIP_LIBRARY} ${Android_LIBRARIES}/libminizip.a) + find_package(game-activity REQUIRED CONFIG) + find_package(EGL REQUIRED) else() - if(NOT WASM) - find_package(OpenGL REQUIRED) - find_package(GLEW REQUIRED) - find_package(LuaJIT REQUIRED) - else() - set(LUA_LIBRARY ${LUA_LIBRARY} ${CMAKE_SOURCE_DIR}/browser/include/lua51/liblua.a) - set(BROWSER_INCLUDE_DIR ${BROWSER_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/browser/include) - endif() + if(NOT WASM) + find_package(OpenGL REQUIRED) + find_package(GLEW REQUIRED) + find_package(LuaJIT REQUIRED) + else() + set(LUA_LIBRARY ${LUA_LIBRARY} ${CMAKE_SOURCE_DIR}/browser/include/lua51/liblua.a) + set(BROWSER_INCLUDE_DIR ${BROWSER_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/browser/include) + endif() endif() # ***************************************************************************** # OTClient source files configuration # ***************************************************************************** set(SOURCE_FILES - framework/core/application.cpp - framework/core/asyncdispatcher.cpp - framework/core/binarytree.cpp - framework/core/clock.cpp - framework/core/config.cpp - framework/core/configmanager.cpp - framework/core/event.cpp - framework/core/eventdispatcher.cpp - framework/core/filestream.cpp - framework/core/logger.cpp - framework/core/module.cpp - framework/core/modulemanager.cpp - framework/core/resourcemanager.cpp - framework/core/scheduledevent.cpp - framework/core/unzipper.cpp - framework/core/unzipper.h - framework/core/timer.cpp - framework/discord/discord.cpp - framework/luaengine/luaexception.cpp - framework/luaengine/luainterface.cpp - framework/luaengine/luaobject.cpp - framework/luaengine/luavaluecasts.cpp - framework/luafunctions.cpp - framework/net/connection.cpp - framework/net/inputmessage.cpp - framework/net/outputmessage.cpp - framework/net/protocol.cpp - framework/net/protocolhttp.cpp - framework/net/httplogin.cpp - framework/net/server.cpp - framework/otml/otmldocument.cpp - framework/otml/otmlemitter.cpp - framework/otml/otmlexception.cpp - framework/otml/otmlnode.cpp - framework/otml/otmlparser.cpp - framework/platform/androidgameactivity.cpp - framework/platform/androidmanager.cpp - framework/platform/androidmanager.h - framework/platform/androidwindow.cpp - framework/platform/androidwindow.h - framework/platform/platform.cpp - framework/platform/platformwindow.cpp - framework/platform/unixcrashhandler.cpp - framework/platform/unixplatform.cpp - framework/platform/win32crashhandler.cpp - framework/platform/win32platform.cpp - framework/stdext/demangle.cpp - framework/stdext/math.cpp - framework/stdext/net.cpp - framework/stdext/string.cpp - framework/stdext/time.cpp - framework/stdext/uri.cpp - framework/stdext/qrcodegen.cpp - framework/util/color.cpp - framework/util/crypt.cpp - framework/proxy/proxy.cpp - framework/proxy/proxy_client.cpp - framework/net/packet_player.cpp - framework/net/packet_recorder.cpp - - client/animatedtext.cpp - client/animator.cpp - client/attachableobject.cpp - client/attachedeffect.cpp - client/attachedeffectmanager.cpp - client/client.cpp - client/container.cpp - client/creature.cpp - client/creatures.cpp - client/effect.cpp - client/game.cpp - client/gameconfig.cpp - client/houses.cpp - client/item.cpp - client/itemtype.cpp - client/lightview.cpp - client/localplayer.cpp - client/luafunctions.cpp - client/luavaluecasts_client.cpp - client/map.cpp - client/mapio.cpp - client/mapview.cpp - client/minimap.cpp - client/missile.cpp - client/outfit.cpp - client/player.cpp - client/position.cpp - client/protocolcodes.cpp - client/protocolgame.cpp - client/protocolgameparse.cpp - client/protocolgamesend.cpp - client/spriteappearances.cpp - client/spritemanager.cpp - client/statictext.cpp - client/thing.cpp - client/thingtype.cpp - client/thingtypemanager.cpp - client/tile.cpp - client/towns.cpp - client/uicreature.cpp - client/uigraph.cpp - client/uiitem.cpp - client/uieffect.cpp - client/uimissile.cpp - client/uimap.cpp - client/uimapanchorlayout.cpp - client/uiminimap.cpp - client/uiprogressrect.cpp - client/uisprite.cpp - - main.cpp - androidmain.cpp + framework/core/application.cpp + framework/core/asyncdispatcher.cpp + framework/core/binarytree.cpp + framework/core/clock.cpp + framework/core/config.cpp + framework/core/configmanager.cpp + framework/core/event.cpp + framework/core/eventdispatcher.cpp + framework/core/filestream.cpp + framework/core/logger.cpp + framework/core/module.cpp + framework/core/modulemanager.cpp + framework/core/resourcemanager.cpp + framework/core/scheduledevent.cpp + framework/core/unzipper.cpp + framework/core/unzipper.h + framework/core/timer.cpp + framework/discord/discord.cpp + framework/luaengine/luaexception.cpp + framework/luaengine/luainterface.cpp + framework/luaengine/luaobject.cpp + framework/luaengine/luavaluecasts.cpp + framework/luafunctions.cpp + framework/net/connection.cpp + framework/net/inputmessage.cpp + framework/net/outputmessage.cpp + framework/net/protocol.cpp + framework/net/protocolhttp.cpp + framework/net/httplogin.cpp + framework/net/server.cpp + framework/otml/otmldocument.cpp + framework/otml/otmlemitter.cpp + framework/otml/otmlexception.cpp + framework/otml/otmlnode.cpp + framework/otml/otmlparser.cpp + framework/platform/androidgameactivity.cpp + framework/platform/androidmanager.cpp + framework/platform/androidmanager.h + framework/platform/androidwindow.cpp + framework/platform/androidwindow.h + framework/platform/platform.cpp + framework/platform/platformwindow.cpp + framework/platform/unixcrashhandler.cpp + framework/platform/unixplatform.cpp + framework/platform/win32crashhandler.cpp + framework/platform/win32platform.cpp + framework/stdext/demangle.cpp + framework/stdext/math.cpp + framework/stdext/net.cpp + framework/stdext/string.cpp + framework/stdext/time.cpp + framework/stdext/uri.cpp + framework/stdext/qrcodegen.cpp + framework/util/color.cpp + framework/util/crypt.cpp + framework/proxy/proxy.cpp + framework/proxy/proxy_client.cpp + framework/net/packet_player.cpp + framework/net/packet_recorder.cpp + + client/animatedtext.cpp + client/animator.cpp + client/attachableobject.cpp + client/attachedeffect.cpp + client/attachedeffectmanager.cpp + client/client.cpp + client/container.cpp + client/creature.cpp + client/creatures.cpp + client/effect.cpp + client/game.cpp + client/gameconfig.cpp + client/houses.cpp + client/item.cpp + client/itemtype.cpp + client/lightview.cpp + client/localplayer.cpp + client/luafunctions.cpp + client/luavaluecasts_client.cpp + client/map.cpp + client/mapio.cpp + client/mapview.cpp + client/minimap.cpp + client/missile.cpp + client/outfit.cpp + client/player.cpp + client/position.cpp + client/protocolcodes.cpp + client/protocolgame.cpp + client/protocolgameparse.cpp + client/protocolgamesend.cpp + client/spriteappearances.cpp + client/spritemanager.cpp + client/statictext.cpp + client/thing.cpp + client/thingtype.cpp + client/thingtypemanager.cpp + client/tile.cpp + client/towns.cpp + client/uicreature.cpp + client/uigraph.cpp + client/uiitem.cpp + client/uieffect.cpp + client/uimissile.cpp + client/uimap.cpp + client/uimapanchorlayout.cpp + client/uiminimap.cpp + client/uiprogressrect.cpp + client/uisprite.cpp + + main.cpp + androidmain.cpp ) if (TOGGLE_FRAMEWORK_GRAPHICS) - set(SOURCE_FILES ${SOURCE_FILES} - framework/core/adaptativeframecounter.cpp - framework/core/graphicalapplication.cpp - framework/core/garbagecollection.cpp - framework/input/mouse.cpp - framework/graphics/animatedtexture.cpp - framework/graphics/apngloader.cpp - framework/graphics/bitmapfont.cpp - framework/graphics/cachedtext.cpp - framework/graphics/coordsbuffer.cpp - framework/graphics/drawpool.cpp - framework/graphics/drawpoolmanager.cpp - framework/graphics/fontmanager.cpp - framework/graphics/framebuffer.cpp - framework/graphics/graphics.cpp - framework/graphics/image.cpp - framework/graphics/painter.cpp - framework/graphics/paintershaderprogram.cpp - framework/graphics/particle.cpp - framework/graphics/particleaffector.cpp - framework/graphics/particleeffect.cpp - framework/graphics/particleemitter.cpp - framework/graphics/particlemanager.cpp - framework/graphics/particlesystem.cpp - framework/graphics/particletype.cpp - framework/graphics/shader.cpp - framework/graphics/shaderprogram.cpp - framework/graphics/texture.cpp - framework/graphics/texturemanager.cpp - framework/graphics/shadermanager.cpp - framework/platform/win32window.cpp - framework/platform/x11window.cpp - framework/ui/uianchorlayout.cpp - framework/ui/uiboxlayout.cpp - framework/ui/uigridlayout.cpp - framework/ui/uihorizontallayout.cpp - framework/ui/uilayout.cpp - framework/ui/uimanager.cpp - framework/ui/uiparticles.cpp - framework/ui/uitextedit.cpp - framework/ui/uitranslator.cpp - framework/ui/uiverticallayout.cpp - framework/ui/uiwidget.cpp - framework/ui/uiwidgetbasestyle.cpp - framework/ui/uiwidgetimage.cpp - framework/ui/uiwidgettext.cpp - framework/ui/uiqrcode.cpp - ) + set(SOURCE_FILES ${SOURCE_FILES} + framework/core/adaptativeframecounter.cpp + framework/core/graphicalapplication.cpp + framework/core/garbagecollection.cpp + framework/input/mouse.cpp + framework/graphics/animatedtexture.cpp + framework/graphics/apngloader.cpp + framework/graphics/bitmapfont.cpp + framework/graphics/cachedtext.cpp + framework/graphics/coordsbuffer.cpp + framework/graphics/drawpool.cpp + framework/graphics/drawpoolmanager.cpp + framework/graphics/fontmanager.cpp + framework/graphics/framebuffer.cpp + framework/graphics/graphics.cpp + framework/graphics/image.cpp + framework/graphics/painter.cpp + framework/graphics/paintershaderprogram.cpp + framework/graphics/particle.cpp + framework/graphics/particleaffector.cpp + framework/graphics/particleeffect.cpp + framework/graphics/particleemitter.cpp + framework/graphics/particlemanager.cpp + framework/graphics/particlesystem.cpp + framework/graphics/particletype.cpp + framework/graphics/shader.cpp + framework/graphics/shaderprogram.cpp + framework/graphics/texture.cpp + framework/graphics/texturemanager.cpp + framework/graphics/shadermanager.cpp + framework/platform/win32window.cpp + framework/platform/x11window.cpp + framework/ui/uianchorlayout.cpp + framework/ui/uiboxlayout.cpp + framework/ui/uigridlayout.cpp + framework/ui/uihorizontallayout.cpp + framework/ui/uilayout.cpp + framework/ui/uimanager.cpp + framework/ui/uiparticles.cpp + framework/ui/uitextedit.cpp + framework/ui/uitranslator.cpp + framework/ui/uiverticallayout.cpp + framework/ui/uiwidget.cpp + framework/ui/uiwidgetbasestyle.cpp + framework/ui/uiwidgetimage.cpp + framework/ui/uiwidgettext.cpp + framework/ui/uiqrcode.cpp + ) endif() if (TOGGLE_FRAMEWORK_SOUND) - set(SOURCE_FILES ${SOURCE_FILES} - framework/sound/combinedsoundsource.cpp - framework/sound/oggsoundfile.cpp - framework/sound/soundbuffer.cpp - framework/sound/soundchannel.cpp - framework/sound/soundfile.cpp - framework/sound/soundmanager.cpp - framework/sound/soundsource.cpp - framework/sound/streamsoundsource.cpp - framework/sound/soundeffect.cpp - ) + set(SOURCE_FILES ${SOURCE_FILES} + framework/sound/combinedsoundsource.cpp + framework/sound/oggsoundfile.cpp + framework/sound/soundbuffer.cpp + framework/sound/soundchannel.cpp + framework/sound/soundfile.cpp + framework/sound/soundmanager.cpp + framework/sound/soundsource.cpp + framework/sound/streamsoundsource.cpp + framework/sound/soundeffect.cpp + ) endif() if (WASM) - set(SOURCE_FILES ${SOURCE_FILES} - framework/platform/browserplatform.cpp - framework/platform/browserwindow.cpp - framework/net/webconnection.cpp - ) + set(SOURCE_FILES ${SOURCE_FILES} + framework/platform/browserplatform.cpp + framework/platform/browserwindow.cpp + framework/net/webconnection.cpp + ) endif() @@ -439,194 +439,194 @@ target_link_options(${PROJECT_NAME} PUBLIC -flto=auto) # ***************************************************************************** if(MSVC) - # Set variables to have Windows Vista Value so httplib will build 'inet_pton' - target_compile_definitions(${PROJECT_NAME} - PRIVATE - NTDDI_VERSION=0x06000000 - _WIN32_WINNT=0x0600 - ) - - target_compile_options(${PROJECT_NAME} PUBLIC /MP /FS /Zf /EHsc ) - - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") - string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") - elseif(CMAKE_BUILD_TYPE STREQUAL "Release") - string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") - string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") - elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") - string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") - string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") - endif() - - if(BUILD_STATIC_LIBRARY) - log_option_enabled("STATIC_LIBRARY") - set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") - find_package(Vorbis REQUIRED) - set_property(TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") - set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "") - else() - log_option_disabled("STATIC_LIBRARY") - set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "") - endif() - - target_include_directories(${PROJECT_NAME} - PRIVATE - $ - $ - ${LUAJIT_INCLUDE_DIR} - ${Protobuf_INCLUDE_DIRS} - ${VORBISFILE_INCLUDE_DIR} - ${GMP_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} - ${PHYSFS_INCLUDE_DIR} - ${PARALLEL_HASHMAP_INCLUDE_DIRS} - ${NLOHMANN_JSON_INCLUDE_DIR} - ) - target_link_libraries(${PROJECT_NAME} - PRIVATE - ${LUAJIT_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} - ${PHYSFS_LIBRARY} - ${ZLIB_LIBRARY} - ${NLOHMANN_JSON_LIBRARY} - ${OPENGL_LIBRARIES} - ${DirectX_LIBRARY} - ${DirectX_LIBRARIES} - ${OGG_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBIS_LIBRARY} - ${GMP_LIBRARY} - ${OPENSSL_LIBRARIES} - ${DBGHELP_LIBRARY} - ${STDUUID} - - protobuf::libprotobuf protobuf - absl::log_internal_check_op - Threads::Threads - GLEW::GLEW - asio::asio - OpenAL::OpenAL - LibLZMA::LibLZMA - winmm.lib - pugixml::pugixml - fmt::fmt-header-only - ) + # Set variables to have Windows Vista Value so httplib will build 'inet_pton' + target_compile_definitions(${PROJECT_NAME} + PRIVATE + NTDDI_VERSION=0x06000000 + _WIN32_WINNT=0x0600 + ) + + target_compile_options(${PROJECT_NAME} PUBLIC /MP /FS /Zf /EHsc ) + + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") + string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") + elseif(CMAKE_BUILD_TYPE STREQUAL "Release") + string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") + elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") + string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") + string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") + endif() + + if(BUILD_STATIC_LIBRARY) + log_option_enabled("STATIC_LIBRARY") + set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib") + find_package(Vorbis REQUIRED) + set_property(TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + set(VCPKG_TARGET_TRIPLET "x64-windows-static" CACHE STRING "") + else() + log_option_disabled("STATIC_LIBRARY") + set(VCPKG_TARGET_TRIPLET "x64-windows" CACHE STRING "") + endif() + + target_include_directories(${PROJECT_NAME} + PRIVATE + $ + $ + ${LUAJIT_INCLUDE_DIR} + ${Protobuf_INCLUDE_DIRS} + ${VORBISFILE_INCLUDE_DIR} + ${GMP_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} + ${PHYSFS_INCLUDE_DIR} + ${PARALLEL_HASHMAP_INCLUDE_DIRS} + ${NLOHMANN_JSON_INCLUDE_DIR} + ) + target_link_libraries(${PROJECT_NAME} + PRIVATE + ${LUAJIT_LIBRARY} + ${CMAKE_THREAD_LIBS_INIT} + ${PHYSFS_LIBRARY} + ${ZLIB_LIBRARY} + ${NLOHMANN_JSON_LIBRARY} + ${OPENGL_LIBRARIES} + ${DirectX_LIBRARY} + ${DirectX_LIBRARIES} + ${OGG_LIBRARY} + ${VORBISFILE_LIBRARY} + ${VORBIS_LIBRARY} + ${GMP_LIBRARY} + ${OPENSSL_LIBRARIES} + ${DBGHELP_LIBRARY} + ${STDUUID} + + protobuf::libprotobuf protobuf + absl::log_internal_check_op + Threads::Threads + GLEW::GLEW + asio::asio + OpenAL::OpenAL + LibLZMA::LibLZMA + winmm.lib + pugixml::pugixml + fmt::fmt-header-only + ) elseif(ANDROID) - target_include_directories(${PROJECT_NAME} - PRIVATE - $ - $ - ${LUAJIT_INCLUDE_DIR} - ${CMAKE_THREAD_LIBS_INIT} - ${Protobuf_INCLUDE_DIRS} - ${GMP_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} - ${PHYSFS_INCLUDE_DIR} - ${EGL_INCLUDE_DIR} - ${PARALLEL_HASHMAP_INCLUDE_DIRS} - ${NLOHMANN_JSON_INCLUDE_DIR} - ${MINIZIP_INCLUDE_DIR} - ) - target_link_libraries(${PROJECT_NAME} - PRIVATE - ${LUA_LIBRARY} - ${LUAJIT_LIBRARY} - ${PHYSFS_LIBRARY} - ${ZLIB_LIBRARY} - ${NLOHMANN_JSON_LIBRARY} - ${EGL_LIBRARY} - ${OGG_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBIS_LIBRARY} - ${GMP_LIBRARY} - ${OpenAL_LIBRARY} - ${OPENSSL_LIBRARIES} - ${STDUUID} - ${MINIZIP_LIBRARY} - - protobuf::libprotobuf protobuf - absl::log_internal_check_op - Threads::Threads - asio::asio - OpenSLES - LibLZMA::LibLZMA - game-activity::game-activity - GLESv3 - android - log - pugixml::pugixml - fmt::fmt-header-only - ) + target_include_directories(${PROJECT_NAME} + PRIVATE + $ + $ + ${LUAJIT_INCLUDE_DIR} + ${CMAKE_THREAD_LIBS_INIT} + ${Protobuf_INCLUDE_DIRS} + ${GMP_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} + ${PHYSFS_INCLUDE_DIR} + ${EGL_INCLUDE_DIR} + ${PARALLEL_HASHMAP_INCLUDE_DIRS} + ${NLOHMANN_JSON_INCLUDE_DIR} + ${MINIZIP_INCLUDE_DIR} + ) + target_link_libraries(${PROJECT_NAME} + PRIVATE + ${LUA_LIBRARY} + ${LUAJIT_LIBRARY} + ${PHYSFS_LIBRARY} + ${ZLIB_LIBRARY} + ${NLOHMANN_JSON_LIBRARY} + ${EGL_LIBRARY} + ${OGG_LIBRARY} + ${VORBISFILE_LIBRARY} + ${VORBIS_LIBRARY} + ${GMP_LIBRARY} + ${OpenAL_LIBRARY} + ${OPENSSL_LIBRARIES} + ${STDUUID} + ${MINIZIP_LIBRARY} + + protobuf::libprotobuf protobuf + absl::log_internal_check_op + Threads::Threads + asio::asio + OpenSLES + LibLZMA::LibLZMA + game-activity::game-activity + GLESv3 + android + log + pugixml::pugixml + fmt::fmt-header-only + ) elseif(WASM) target_include_directories(${PROJECT_NAME} - PRIVATE - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_THREAD_LIBS_INIT} - ${Protobuf_INCLUDE_DIRS} - ${GMP_INCLUDE_DIR} - ${PHYSFS_INCLUDE_DIR} - ${GLEW_INCLUDE_DIR} - ${PARALLEL_HASHMAP_INCLUDE_DIRS} - ${NLOHMANN_JSON_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} - ${BROWSER_INCLUDE_DIR} - ) - target_link_libraries(${PROJECT_NAME} - PRIVATE - ${LUA_LIBRARY} - ${PHYSFS_LIBRARY} - ${ZLIB_LIBRARY} - ${PROTOBUF_LIBRARY} - ${NLOHMANN_JSON_LIBRARY} - ${GLEW_LIBRARY} - ${OPENGL_LIBRARIES} - ${DirectX_LIBRARY} - ${DirectX_LIBRARIES} - ${OGG_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBIS_LIBRARY} - ${GMP_LIBRARY} - ${STDUUID} - ${FOUNDATION} - ${IOKIT} - ${OPENSSL_LIBRARY} - ${OPENSSL_CRYPTO_LIBRARY} - ${HTTPLIB_LIBRARY} - - protobuf::libprotobuf protobuf - absl::log_internal_check_op - - Threads::Threads - asio::asio - # OpenAL::OpenAL (using emscripten openal api) - LibLZMA::LibLZMA - pugixml::pugixml - ZLIB::ZLIB - OpenSSL::SSL - OpenSSL::Crypto - httplib::httplib - fmt::fmt - Ogg::ogg - Vorbis::vorbisfile - Vorbis::vorbis - ) - - - get_property(linkflags TARGET ${PROJECT_NAME} PROPERTY LINK_FLAGS) - - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - target_compile_options(${PROJECT_NAME} - PRIVATE - -Wall -Wextra -Wpedantic - ) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") - set(linkflags "${linkflags} -sASSERTIONS=1") - endif() - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math -frtti -pthread -fexceptions") - set(linkflags "${linkflags} + PRIVATE + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_THREAD_LIBS_INIT} + ${Protobuf_INCLUDE_DIRS} + ${GMP_INCLUDE_DIR} + ${PHYSFS_INCLUDE_DIR} + ${GLEW_INCLUDE_DIR} + ${PARALLEL_HASHMAP_INCLUDE_DIRS} + ${NLOHMANN_JSON_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} + ${BROWSER_INCLUDE_DIR} + ) + target_link_libraries(${PROJECT_NAME} + PRIVATE + ${LUA_LIBRARY} + ${PHYSFS_LIBRARY} + ${ZLIB_LIBRARY} + ${PROTOBUF_LIBRARY} + ${NLOHMANN_JSON_LIBRARY} + ${GLEW_LIBRARY} + ${OPENGL_LIBRARIES} + ${DirectX_LIBRARY} + ${DirectX_LIBRARIES} + ${OGG_LIBRARY} + ${VORBISFILE_LIBRARY} + ${VORBIS_LIBRARY} + ${GMP_LIBRARY} + ${STDUUID} + ${FOUNDATION} + ${IOKIT} + ${OPENSSL_LIBRARY} + ${OPENSSL_CRYPTO_LIBRARY} + ${HTTPLIB_LIBRARY} + + protobuf::libprotobuf protobuf + absl::log_internal_check_op + + Threads::Threads + asio::asio + # OpenAL::OpenAL (using emscripten openal api) + LibLZMA::LibLZMA + pugixml::pugixml + ZLIB::ZLIB + OpenSSL::SSL + OpenSSL::Crypto + httplib::httplib + fmt::fmt + Ogg::ogg + Vorbis::vorbisfile + Vorbis::vorbis + ) + + + get_property(linkflags TARGET ${PROJECT_NAME} PROPERTY LINK_FLAGS) + + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(${PROJECT_NAME} + PRIVATE + -Wall -Wextra -Wpedantic + ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") + set(linkflags "${linkflags} -sASSERTIONS=1") + endif() + + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math -frtti -pthread -fexceptions") + set(linkflags "${linkflags} -sINVOKE_RUN=0 -sEXIT_RUNTIME=1 -sTEXTDECODER=0 -sCASE_INSENSITIVE_FS=1 -lopenal -lidbfs.js -lwebsocket.js -sEXPORTED_RUNTIME_METHODS=ccall -sEXPORTED_FUNCTIONS=_main,_paste_return -sINCOMING_MODULE_JS_API=[locateFile,preRun,postRun,print,printErr,canvas,setStatus,monitorRunDependencies] @@ -637,71 +637,71 @@ elseif(WASM) --preload-file=../otclientrc.lua@otclientrc.lua --preload-file=../init.lua@init.lua --preload-file=../data@data --preload-file=../mods@mods --preload-file=../modules@modules --shell-file=../browser/shell.html --use-preload-cache") - set_target_properties(${PROJECT_NAME} PROPERTIES - LINK_FLAGS ${linkflags}) - set(CMAKE_EXECUTABLE_SUFFIX ".html") - set(VCPKG_TARGET_TRIPLET "wasm32-emscripten" CACHE STRING "") + set_target_properties(${PROJECT_NAME} PROPERTIES + LINK_FLAGS ${linkflags}) + set(CMAKE_EXECUTABLE_SUFFIX ".html") + set(VCPKG_TARGET_TRIPLET "wasm32-emscripten" CACHE STRING "") else() # Linux - target_include_directories(${PROJECT_NAME} - PRIVATE - $ - $ - ${LUAJIT_INCLUDE_DIR} - ${CMAKE_THREAD_LIBS_INIT} - ${Protobuf_INCLUDE_DIRS} - ${GMP_INCLUDE_DIR} - ${PHYSFS_INCLUDE_DIR} - ${GLEW_INCLUDE_DIR} - ${PARALLEL_HASHMAP_INCLUDE_DIRS} - ${NLOHMANN_JSON_INCLUDE_DIR} - ${OPENSSL_INCLUDE_DIR} - ) - target_link_libraries(${PROJECT_NAME} - PRIVATE - ${LUAJIT_LIBRARY} - ${PHYSFS_LIBRARY} - ${ZLIB_LIBRARY} - ${NLOHMANN_JSON_LIBRARY} - ${GLEW_LIBRARY} - ${OPENGL_LIBRARIES} - ${DirectX_LIBRARY} - ${DirectX_LIBRARIES} - ${OGG_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBIS_LIBRARY} - ${GMP_LIBRARY} - ${STDUUID} - ${FOUNDATION} - ${IOKIT} - ${OPENSSL_LIBRARY} - ${OPENSSL_CRYPTO_LIBRARY} - ${HTTPLIB_LIBRARY} - - protobuf::libprotobuf protobuf - absl::log_internal_check_op - Threads::Threads - X11::X11 - asio::asio - OpenAL::OpenAL - LibLZMA::LibLZMA - pugixml::pugixml - ZLIB::ZLIB - OpenSSL::SSL - OpenSSL::Crypto - httplib::httplib - fmt::fmt-header-only - Ogg::ogg - Vorbis::vorbisfile - Vorbis::vorbis - ) - - if(CMAKE_BUILD_TYPE STREQUAL "Debug") - target_compile_options(${PROJECT_NAME} - PRIVATE - -Wall -Wextra -Wpedantic - ) - endif() + target_include_directories(${PROJECT_NAME} + PRIVATE + $ + $ + ${LUAJIT_INCLUDE_DIR} + ${CMAKE_THREAD_LIBS_INIT} + ${Protobuf_INCLUDE_DIRS} + ${GMP_INCLUDE_DIR} + ${PHYSFS_INCLUDE_DIR} + ${GLEW_INCLUDE_DIR} + ${PARALLEL_HASHMAP_INCLUDE_DIRS} + ${NLOHMANN_JSON_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} + ) + target_link_libraries(${PROJECT_NAME} + PRIVATE + ${LUAJIT_LIBRARY} + ${PHYSFS_LIBRARY} + ${ZLIB_LIBRARY} + ${NLOHMANN_JSON_LIBRARY} + ${GLEW_LIBRARY} + ${OPENGL_LIBRARIES} + ${DirectX_LIBRARY} + ${DirectX_LIBRARIES} + ${OGG_LIBRARY} + ${VORBISFILE_LIBRARY} + ${VORBIS_LIBRARY} + ${GMP_LIBRARY} + ${STDUUID} + ${FOUNDATION} + ${IOKIT} + ${OPENSSL_LIBRARY} + ${OPENSSL_CRYPTO_LIBRARY} + ${HTTPLIB_LIBRARY} + + protobuf::libprotobuf protobuf + absl::log_internal_check_op + Threads::Threads + X11::X11 + asio::asio + OpenAL::OpenAL + LibLZMA::LibLZMA + pugixml::pugixml + ZLIB::ZLIB + OpenSSL::SSL + OpenSSL::Crypto + httplib::httplib + fmt::fmt-header-only + Ogg::ogg + Vorbis::vorbisfile + Vorbis::vorbis + ) + + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(${PROJECT_NAME} + PRIVATE + -Wall -Wextra -Wpedantic + ) + endif() endif() @@ -709,13 +709,13 @@ endif() # Enable otclient console only for debug build # ***************************************************************************** if(WIN32) - set_target_properties(${PROJECT_NAME} - PROPERTIES - LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE" - LINK_FLAGS_RELEASE "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" - LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE" - LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" - ) + set_target_properties(${PROJECT_NAME} + PROPERTIES + LINK_FLAGS_DEBUG "/SUBSYSTEM:CONSOLE" + LINK_FLAGS_RELEASE "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" + LINK_FLAGS_RELWITHDEBINFO "/SUBSYSTEM:CONSOLE" + LINK_FLAGS_MINSIZEREL "/SUBSYSTEM:windows /ENTRY:mainCRTStartup" + ) endif(WIN32) if(ANDROID) @@ -729,13 +729,13 @@ endif() ## Link compilation files to build/bin folder, else link to the main dir if (TOGGLE_BIN_FOLDER) - set_target_properties(${PROJECT_NAME} - PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) + set_target_properties(${PROJECT_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + ) else() - set_target_properties(${PROJECT_NAME} - PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/" - ) + set_target_properties(${PROJECT_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/" + ) endif() diff --git a/src/framework/platform/androidgameactivity.cpp b/src/framework/platform/androidgameactivity.cpp index 9203839f61..394df40208 100644 --- a/src/framework/platform/androidgameactivity.cpp +++ b/src/framework/platform/androidgameactivity.cpp @@ -1,9 +1,9 @@ #ifdef ANDROID -#include -#include +#include +#include extern "C" { - #include + #include } -#endif \ No newline at end of file +#endif