mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 17:59:56 +00:00
Code Issues Releases Wiki Activity

Keep separation between openmw and openmw-lib on Android

Browse source 
They are not set up properly so CMake configuration fails because of not found
openmw-lib target since it's not defined for Android.
This commit is contained in:
elsid 2024-06-30 15:52:46 +02:00
parent b1de8ed720
commit b3abc436dd
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw/CMakeLists.txt
View file

@ -8,10 +8,6 @@ set(OPENMW_RESOURCES
${CMAKE_SOURCE_DIR}/files/windows/openmw.exe.manifest
)
if (ANDROID)
set(OPENMW_SOURCES ${OPENMW_SOURCES} android_main.cpp)
endif()
set(OPENMW_HEADERS
doc.hpp
engine.hpp
@ -19,7 +15,7 @@ set(OPENMW_HEADERS
profile.hpp
)
source_group(apps/openmw FILES main.cpp ${OPENMW_SOURCES} ${OPENMW_HEADERS} ${OPENMW_RESOURCES})
source_group(apps/openmw FILES main.cpp android_main.cpp ${OPENMW_SOURCES} ${OPENMW_HEADERS} ${OPENMW_RESOURCES})
add_openmw_dir (mwrender
actors objects renderingmanager animation rotatecontroller sky skyutil npcanimation esm4npcanimation vismask
@ -122,7 +118,6 @@ add_openmw_dir (mwbase
# Main executable
if (NOT ANDROID)
add_library(openmw-lib STATIC
${OPENMW_FILES}
${OPENMW_SOURCES}
@ -132,13 +127,13 @@ if (NOT ANDROID)
if(NOT WIN32)
set_target_properties(openmw-lib PROPERTIES OUTPUT_NAME openmw)
endif()
endif ()
if(BUILD_OPENMW)
if (ANDROID)
add_library(openmw-lib SHARED
add_library(openmw SHARED
${OPENMW_FILES}
${OPENMW_SOURCES}
main.cpp
android_main.cpp
)
else()
openmw_add_executable(openmw
@ -146,10 +141,10 @@ if(BUILD_OPENMW)
${OPENMW_RESOURCES}
main.cpp
)
endif()
target_link_libraries(openmw openmw-lib)
endif()
endif()
# Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
# when we change the backend.