This commit is contained in:
tildearrow 2024-06-18 15:49:09 -05:00
parent 159d5c66fa
commit 14dffd62d0
2 changed files with 9 additions and 18 deletions

View file

@ -235,19 +235,18 @@ jobs:
run: | run: |
pushd build pushd build
echo "preparing bundle"
mkdir -p Furnace.app/Resources
cp -v -r po/locale Furnace.app/Resources/locale
cp -v ../res/icon.icns Furnace.app/Resources
codesign -s - Furnace.app
echo "making dirs" echo "making dirs"
mkdir new mkdir new
make DESTDIR=final install
find Furnace.app
ls final/usr
echo "TODO: code sign..."
echo "copying" echo "copying"
cp -v -r final/usr/Applications/furnace.app new/furnace.app cp -v -r Furnace.app new/Furnace.app
echo "synchronizing" echo "synchronizing"
sync sync

View file

@ -93,7 +93,6 @@ else()
endif() endif()
endif() endif()
# until ready
set(WITH_LOCALE_DEFAULT ON) set(WITH_LOCALE_DEFAULT ON)
try_compile(HAVE_SETLOCALE ${CMAKE_BINARY_DIR}/check SOURCES ${CMAKE_SOURCE_DIR}/src/check/check_setlocale.c) try_compile(HAVE_SETLOCALE ${CMAKE_BINARY_DIR}/check SOURCES ${CMAKE_SOURCE_DIR}/src/check/check_setlocale.c)
@ -1183,11 +1182,6 @@ if (WIN32 AND CONSOLE_SUBSYSTEM)
list(APPEND DEPENDENCIES_DEFINES "TA_SUBSYSTEM_CONSOLE") list(APPEND DEPENDENCIES_DEFINES "TA_SUBSYSTEM_CONSOLE")
endif() endif()
if (MAKE_BUNDLE AND NOT FORCE_APPLE_BIN)
file(GLOB_RECURSE LOCALE_FILES po/locale)
list(APPEND USED_SOURCES ${LOCALE_FILES})
endif()
if (MAKE_BUNDLE) if (MAKE_BUNDLE)
set(FURNACE Furnace) set(FURNACE Furnace)
else() else()
@ -1205,9 +1199,7 @@ endif()
if (MAKE_BUNDLE AND NOT FORCE_APPLE_BIN) if (MAKE_BUNDLE AND NOT FORCE_APPLE_BIN)
set_target_properties(${FURNACE} PROPERTIES set_target_properties(${FURNACE} PROPERTIES
MACOSX_BUNDLE True MACOSX_BUNDLE True
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/res/Info.plist)
RESOURCE "${LOCALE_FILES}")
set_source_files_properties("${LOCALE_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif() endif()
target_include_directories(${FURNACE} SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS}) target_include_directories(${FURNACE} SYSTEM PRIVATE ${DEPENDENCIES_INCLUDE_DIRS})