otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

let s try this

Browse source
This commit is contained in:
tildearrow 2024-06-18 13:32:42 -05:00
parent 9aed6fc47c
commit d8600e1620
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -173,9 +173,9 @@ jobs:
fi fi
elif [ '${{ runner.os }}' == 'macOS' ]; then elif [ '${{ runner.os }}' == 'macOS' ]; then
if [ '${{ matrix.config.arch }}' == 'arm64' ]; then if [ '${{ matrix.config.arch }}' == 'arm64' ]; then
CMAKE_EXTRA_ARGS+=('-DCMAKE_OSX_DEPLOYMENT_TARGET="11.0"' '-DCMAKE_OSX_ARCHITECTURES=arm64') CMAKE_EXTRA_ARGS+=('-DCMAKE_OSX_DEPLOYMENT_TARGET="11.0"' '-DCMAKE_OSX_ARCHITECTURES=arm64' '-DMAKE_BUNDLE=ON')
else else
CMAKE_EXTRA_ARGS+=('-DCMAKE_OSX_DEPLOYMENT_TARGET="10.9"' '-DCMAKE_OSX_ARCHITECTURES=x86_64') CMAKE_EXTRA_ARGS+=('-DCMAKE_OSX_DEPLOYMENT_TARGET="10.9"' '-DCMAKE_OSX_ARCHITECTURES=x86_64' '-DMAKE_BUNDLE=ON')
fi fi
elif [ '${{ runner.os }}' == 'Linux' ] && [ '${{ matrix.config.arch }}' == 'armhf' ]; then elif [ '${{ runner.os }}' == 'Linux' ] && [ '${{ matrix.config.arch }}' == 'armhf' ]; then
CMAKE_EXTRA_ARGS+=('-DCMAKE_TOOLCHAIN_FILE=scripts/Cross-Linux-armhf.cmake') CMAKE_EXTRA_ARGS+=('-DCMAKE_TOOLCHAIN_FILE=scripts/Cross-Linux-armhf.cmake')

7
CMakeLists.txt
View file

@ -143,6 +143,7 @@ if (APPLE)
else() else()
# not Apple - not needed # not Apple - not needed
set(FORCE_APPLE_BIN OFF) set(FORCE_APPLE_BIN OFF)
set(MAKE_BUNDLE OFF)
endif() endif()
set(DEPENDENCIES_INCLUDE_DIRS extern/IconFontCppHeaders src/icon) set(DEPENDENCIES_INCLUDE_DIRS extern/IconFontCppHeaders src/icon)
@ -1182,7 +1183,7 @@ if (WIN32 AND CONSOLE_SUBSYSTEM)
list(APPEND DEPENDENCIES_DEFINES "TA_SUBSYSTEM_CONSOLE") list(APPEND DEPENDENCIES_DEFINES "TA_SUBSYSTEM_CONSOLE")
endif() endif()
if (APPLE AND NOT FORCE_APPLE_BIN) if (MAKE_BUNDLE AND NOT FORCE_APPLE_BIN)
file(GLOB_RECURSE LOCALE_FILES po/locale) file(GLOB_RECURSE LOCALE_FILES po/locale)
list(APPEND USED_SOURCES ${LOCALE_FILES}) list(APPEND USED_SOURCES ${LOCALE_FILES})
endif() endif()
@ -1195,8 +1196,8 @@ else()
add_executable(furnace ${USED_SOURCES}) add_executable(furnace ${USED_SOURCES})
endif() endif()
if (APPLE AND NOT FORCE_APPLE_BIN) if (MAKE_BUNDLE AND NOT FORCE_APPLE_BIN)
set_target_properties(furnace PROPERTIES RESOURCE "${LOCALE_FILES}") set_target_properties(furnace PROPERTIES MACOSX_BUNDLE True MACOSX_BUNDLE_INFO_PLIST res/Info.plist RESOURCE "${LOCALE_FILES}")
endif() endif()
target_include_directories(furnace SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS}) target_include_directories(furnace SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS})