Merge pull request #173 from ryandesign/cmake-powerpc

Make ppc/carbon cmake files refer to powerpc dir
This commit is contained in:
Wolfgang Thaller 2022-09-22 21:58:10 +02:00 committed by GitHub
commit c0fcf42d04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -25,7 +25,7 @@ set( CMAKE_SYSTEM_PREFIX_PATH "${RETRO68_ROOT}/powerpc-apple-macos/" )
set( MAKE_PEF "${RETRO68_ROOT}/bin/MakePEF" ) set( MAKE_PEF "${RETRO68_ROOT}/bin/MakePEF" )
set( MAKE_IMPORT "${RETRO68_ROOT}/bin/MakeImport" ) set( MAKE_IMPORT "${RETRO68_ROOT}/bin/MakeImport" )
set( REZ "${RETRO68_ROOT}/bin/Rez" ) set( REZ "${RETRO68_ROOT}/bin/Rez" )
set( REZ_INCLUDE_PATH "${RETRO68_ROOT}/m68k-apple-macos/RIncludes" ) set( REZ_INCLUDE_PATH "${RETRO68_ROOT}/powerpc-apple-macos/RIncludes" )
set( CMAKE_C_COMPILER "${RETRO68_ROOT}/bin/powerpc-apple-macos-gcc" ) set( CMAKE_C_COMPILER "${RETRO68_ROOT}/bin/powerpc-apple-macos-gcc" )
set( CMAKE_CXX_COMPILER "${RETRO68_ROOT}/bin/powerpc-apple-macos-g++" ) set( CMAKE_CXX_COMPILER "${RETRO68_ROOT}/bin/powerpc-apple-macos-g++" )
@ -35,5 +35,5 @@ set( REZ_TEMPLATES_PATH ${REZ_INCLUDE_PATH})
add_definitions( -DTARGET_API_MAC_CARBON=1 ) add_definitions( -DTARGET_API_MAC_CARBON=1 )
list( APPEND CMAKE_MODULE_PATH "${RETRO68_ROOT}/m68k-apple-macos/cmake" ) list( APPEND CMAKE_MODULE_PATH "${RETRO68_ROOT}/powerpc-apple-macos/cmake" )
include(add_application) include(add_application)

View File

@ -25,12 +25,12 @@ set( CMAKE_SYSTEM_PREFIX_PATH "${RETRO68_ROOT}/powerpc-apple-macos/" )
set( MAKE_PEF "${RETRO68_ROOT}/bin/MakePEF" ) set( MAKE_PEF "${RETRO68_ROOT}/bin/MakePEF" )
set( MAKE_IMPORT "${RETRO68_ROOT}/bin/MakeImport" ) set( MAKE_IMPORT "${RETRO68_ROOT}/bin/MakeImport" )
set( REZ "${RETRO68_ROOT}/bin/Rez" ) set( REZ "${RETRO68_ROOT}/bin/Rez" )
set( REZ_INCLUDE_PATH "${RETRO68_ROOT}/m68k-apple-macos/RIncludes" ) set( REZ_INCLUDE_PATH "${RETRO68_ROOT}/powerpc-apple-macos/RIncludes" )
set( CMAKE_C_COMPILER "${RETRO68_ROOT}/bin/powerpc-apple-macos-gcc" ) set( CMAKE_C_COMPILER "${RETRO68_ROOT}/bin/powerpc-apple-macos-gcc" )
set( CMAKE_CXX_COMPILER "${RETRO68_ROOT}/bin/powerpc-apple-macos-g++" ) set( CMAKE_CXX_COMPILER "${RETRO68_ROOT}/bin/powerpc-apple-macos-g++" )
set( REZ_TEMPLATES_PATH ${REZ_INCLUDE_PATH}) set( REZ_TEMPLATES_PATH ${REZ_INCLUDE_PATH})
list( APPEND CMAKE_MODULE_PATH "${RETRO68_ROOT}/m68k-apple-macos/cmake" ) list( APPEND CMAKE_MODULE_PATH "${RETRO68_ROOT}/powerpc-apple-macos/cmake" )
include(add_application) include(add_application)