Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2025-01-17 13:31:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gcc12-update

Browse Source
This commit is contained in:
Wolfgang Thaller 2023-12-29 14:32:26 +01:00
commit 86146d338b
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ InterfacesAndLibraries
/result /result
/result-* /result-*
/build /build
.direnv

6
Samples/SystemExtension/CMakeLists.txt
View File

@ -46,10 +46,14 @@ set_target_properties(SystemExtension PROPERTIES
# of code in a data file # of code in a data file
LINK_FLAGS -Wl,--mac-flat) LINK_FLAGS -Wl,--mac-flat)
if (REZ_INCLUDE_PATH)
set(REZ_INCLUDE_FLAG -I${REZ_INCLUDE_PATH})
endif()
# Use Rez to put it together # Use Rez to put it together
add_custom_command( add_custom_command(
OUTPUT SystemExtension.bin SystemExtension.dsk OUTPUT SystemExtension.bin SystemExtension.dsk
COMMAND ${REZ} -I ${REZ_INCLUDE_PATH} COMMAND ${REZ} ${REZ_INCLUDE_FLAG}
${CMAKE_CURRENT_SOURCE_DIR}/SystemExtension.r ${CMAKE_CURRENT_SOURCE_DIR}/SystemExtension.r
--copy ${CMAKE_CURRENT_SOURCE_DIR}/Icons.rsrc.bin --copy ${CMAKE_CURRENT_SOURCE_DIR}/Icons.rsrc.bin
-o SystemExtension.bin -o SystemExtension.bin

6
Samples/WDEF/CMakeLists.txt
View File

@ -67,10 +67,14 @@ elseif(CMAKE_SYSTEM_NAME MATCHES RetroPPC)
set(WDEF_RESOURCE WDEF.pef) set(WDEF_RESOURCE WDEF.pef)
endif() endif()
if (REZ_INCLUDE_PATH)
set(REZ_INCLUDE_FLAG -I${REZ_INCLUDE_PATH})
endif()
# wrap the compiled WDEF into a resource # wrap the compiled WDEF into a resource
add_custom_command( add_custom_command(
OUTPUT WDEF.rsrc.bin OUTPUT WDEF.rsrc.bin
COMMAND ${REZ} -I ${REZ_INCLUDE_PATH} COMMAND ${REZ} ${REZ_INCLUDE_FLAG}
${CMAKE_CURRENT_SOURCE_DIR}/${WDEF_R} ${CMAKE_CURRENT_SOURCE_DIR}/${WDEF_R}
-o WDEF.rsrc.bin -o WDEF.rsrc.bin

2
azure-pipelines.yml
View File

@ -55,7 +55,7 @@ jobs:
- job: macOS - job: macOS
pool: pool:
vmImage: 'macOS-11' vmImage: 'macOS-13'
timeoutInMinutes: 90 timeoutInMinutes: 90
steps: steps:
- checkout: self - checkout: self