AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update hecl-gui; disable macOS .app for Editor

This commit is contained in:
Luke Street 2021-03-19 15:00:24 -04:00
parent cf6337ec3e
commit 3bbd49b7ca
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Editor/CMakeLists.txt
View File

@ -61,10 +61,7 @@ if(WIN32)
list(APPEND PLAT_SRCS ${UWP_ASSETS} platforms/win/Package.appxmanifest) list(APPEND PLAT_SRCS ${UWP_ASSETS} platforms/win/Package.appxmanifest)
endif() endif()
elseif(APPLE) elseif(APPLE)
set(PLAT_SRCS platforms/mac/mainicon.icns) # nothing
set_source_files_properties(platforms/mac/mainicon.icns PROPERTIES
MACOSX_PACKAGE_LOCATION Resources)
configure_file(platforms/mac/Info.plist.in "${CMAKE_CURRENT_BINARY_DIR}/Info.plist" @ONLY)
elseif(UNIX) elseif(UNIX)
add_subdirectory(platforms/freedesktop) add_subdirectory(platforms/freedesktop)
declare_wmicon_target() declare_wmicon_target()
@ -72,7 +69,7 @@ elseif(UNIX)
set(URDE_PLAT_LIBS rt) set(URDE_PLAT_LIBS rt)
endif() endif()
add_executable(urde WIN32 MACOSX_BUNDLE add_executable(urde WIN32
main.cpp ${PLAT_SRCS} main.cpp ${PLAT_SRCS}
Space.hpp Space.cpp Space.hpp Space.cpp
SplashScreen.hpp SplashScreen.cpp SplashScreen.hpp SplashScreen.cpp
@ -114,17 +111,7 @@ if(COMMAND add_sanitizers)
add_sanitizers(urde) add_sanitizers(urde)
endif() endif()
set_target_properties(urde PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist"
MACOSX_BUNDLE_BUNDLE_NAME "urde")
if (NOT WINDOWS_STORE) if (NOT WINDOWS_STORE)
if(APPLE)
add_custom_command(TARGET urde POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:visigen> $<TARGET_FILE_DIR:urde>)
add_custom_command(TARGET urde POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:hecl> $<TARGET_FILE_DIR:urde>)
endif()
add_dependencies(urde visigen hecl) add_dependencies(urde visigen hecl)
else() else()
set_property(TARGET urde PROPERTY VS_WINRT_COMPONENT TRUE) set_property(TARGET urde PROPERTY VS_WINRT_COMPONENT TRUE)

2
hecl-gui

@ -1 +1 @@
Subproject commit 3577fdf54aae5bc8bd7e8a81200b4bc3153fb630 Subproject commit fc0298ed1fd02b84dc43b8eaae395940bac44b3d