mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Remove checking the Platform and the App Type,
The check must be done, but not on the way I tried to do. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
This commit is contained in:
parent
85946700eb
commit
89658cc291
1 changed files with 47 additions and 49 deletions
|
@ -119,18 +119,16 @@ include_directories(.
|
|||
# Project Target specific configuration should go here,
|
||||
# if the configuration is too big or would disrupt the normal code flux,
|
||||
# move it somewhere else (another file) and include it.
|
||||
if(SUBSURFACE_TARGET_PLATFORM MATCHES "Android")
|
||||
set(FBSUPPORT OFF)
|
||||
set(NO_PRINTING ON)
|
||||
list(APPEND QT_EXTRA_COMPONENTS AndroidExtras Quick)
|
||||
list(APPEND QT_EXTRA_LIBRARIES Qt5::AndroidExtras Qt5::Quick)
|
||||
set(SUBSURFACE_TARGET subsurface)
|
||||
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -llog)
|
||||
add_definitions(-DSUBSURFACE_MOBILE)
|
||||
elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "AndroidEmulator")
|
||||
elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "iOS")
|
||||
elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "iOSEmulator")
|
||||
elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "Desktop")
|
||||
# if(SUBSURFACE_TARGET_PLATFORM MATCHES "Android")
|
||||
# set(FBSUPPORT OFF)
|
||||
# set(NO_PRINTING ON)
|
||||
# list(APPEND QT_EXTRA_COMPONENTS AndroidExtras Quick)
|
||||
# list(APPEND QT_EXTRA_LIBRARIES Qt5::AndroidExtras Qt5::Quick)
|
||||
# set(SUBSURFACE_TARGET subsurface)
|
||||
# set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -llog)
|
||||
# add_definitions(-DSUBSURFACE_MOBILE)
|
||||
# elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "AndroidEmulator")
|
||||
|
||||
# set up the different target platforms
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set(SUBSURFACE_TARGET subsurface)
|
||||
|
@ -168,7 +166,7 @@ elseif(SUBSURFACE_TARGET_PLATFORM MATCHES "Desktop")
|
|||
remove_definitions(-DUNICODE)
|
||||
add_definitions(-mwindows -D_WIN32)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
if(BTSUPPORT)
|
||||
list(APPEND QT_EXTRA_COMPONENTS Bluetooth)
|
||||
|
|
Loading…
Add table
Reference in a new issue