From 1648d14d980f32d8fe3def6bd010629ffca06a1f Mon Sep 17 00:00:00 2001 From: Cas Cremers Date: Thu, 22 Nov 2012 14:31:19 +0100 Subject: [PATCH] Dropped Mac PPC support for now; only Intel binaries will be available. --- src/BuildMacIntel-MacPPC.cmake | 8 ---- src/BuildMacIntel.cmake | 2 +- src/BuildMacPPC-MacIntel.cmake | 8 ---- src/BuildMacPPC.cmake | 11 ----- src/BuildPlatform.cmake | 5 --- src/UniversalBinary.cmake | 42 ------------------- src/build.sh | 2 +- ...mac-universal.sh => subbuild-mac-intel.sh} | 8 ++-- 8 files changed, 5 insertions(+), 81 deletions(-) delete mode 100644 src/BuildMacIntel-MacPPC.cmake delete mode 100644 src/BuildMacPPC-MacIntel.cmake delete mode 100644 src/BuildMacPPC.cmake delete mode 100644 src/UniversalBinary.cmake rename src/{subbuild-mac-universal.sh => subbuild-mac-intel.sh} (57%) diff --git a/src/BuildMacIntel-MacPPC.cmake b/src/BuildMacIntel-MacPPC.cmake deleted file mode 100644 index 7532732..0000000 --- a/src/BuildMacIntel-MacPPC.cmake +++ /dev/null @@ -1,8 +0,0 @@ -################################################################ -# Name: BuildMacIntel-MacPPC.cmake -# Purpose: Build MacPPC binary on MacIntel -# Author: Cas Cremers -################################################################ - -include (BuildMacPPC.cmake) - diff --git a/src/BuildMacIntel.cmake b/src/BuildMacIntel.cmake index f8ce918..aa4721b 100644 --- a/src/BuildMacIntel.cmake +++ b/src/BuildMacIntel.cmake @@ -5,7 +5,7 @@ ################################################################ message (STATUS "Building Apple Mac Intel version") -set (scythername "scyther-macintel") +set (scythername "scyther-mac") add_executable (${scythername} ${Scyther_sources}) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fnested-functions -arch i386") diff --git a/src/BuildMacPPC-MacIntel.cmake b/src/BuildMacPPC-MacIntel.cmake deleted file mode 100644 index dc6a827..0000000 --- a/src/BuildMacPPC-MacIntel.cmake +++ /dev/null @@ -1,8 +0,0 @@ -################################################################ -# Name: BuildMacPPC-MacIntel.cmake -# Purpose: Build MacIntel binary on MacPPC -# Author: Cas Cremers -################################################################ - -include (BuildMacIntel.cmake) - diff --git a/src/BuildMacPPC.cmake b/src/BuildMacPPC.cmake deleted file mode 100644 index 8fe87a0..0000000 --- a/src/BuildMacPPC.cmake +++ /dev/null @@ -1,11 +0,0 @@ -################################################################ -# Name: BuildMacPPC.cmake -# Purpose: Build MacPPC binary -# Author: Cas Cremers -################################################################ - -message (STATUS "Building Apple Mac PPC version") -set (scythername "scyther-macppc") -add_executable (${scythername} ${Scyther_sources}) -set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fnested-functions -arch ppc") - diff --git a/src/BuildPlatform.cmake b/src/BuildPlatform.cmake index f54a5eb..d597e4f 100644 --- a/src/BuildPlatform.cmake +++ b/src/BuildPlatform.cmake @@ -4,11 +4,6 @@ # Author: Cas Cremers ################################################################ -# Add target for Universal Binary when needed -if (APPLE) - include (UniversalBinary.cmake) -endif (APPLE) - # Retrieve Source_OS, Destination_OS (from -DTARGET) include (GetOS.cmake) diff --git a/src/UniversalBinary.cmake b/src/UniversalBinary.cmake deleted file mode 100644 index 1dd17d2..0000000 --- a/src/UniversalBinary.cmake +++ /dev/null @@ -1,42 +0,0 @@ -################################################################ -# Name: UniversalBinary.cmake -# Purpose: Add target to make a Mac universal binary -# Needs pre-build mac versions first! -# Author: Cas Cremers -################################################################ - -find_program(lipoexecutable lipo) -if (lipoexecutable) - # Check whether we already have the binaries - set (UBrequiredfiles FALSE) - set (ppcfile "scyther-macppc") - set (intelfile "scyther-macintel") - if (EXISTS "${ppcfile}") - if (EXISTS "${intelfile}") - set (UBrequiredfiles TRUE) - else (EXISTS "${intelfile}") - message (STATUS "Could not find scyther-macintel.") - endif (EXISTS "${intelfile}") - else (EXISTS "${ppcfile}") - message (STATUS "Could not find scyther-macppc.") - endif (EXISTS "${ppcfile}") - - # Use information to proceed - if (UBrequiredfiles) - message (STATUS "Adding target for Mac universal binary") - add_custom_target (scyther-mac - COMMAND lipo -create "${ppcfile}" "${intelfile}" -output scyther-mac - COMMENT "Generating Mac universal binary" - DEPENDS scyther-macintel - DEPENDS scyther-macppc - ) - else (UBrequiredfiles) - message (STATUS "No universal binary possible yet. Please do the following:") - message (STATUS " cmake -DTARGETOS=MacPPC . && make") - message (STATUS " cmake -DTARGETOS=MacIntel . && make") - message (STATUS " cmake . && make scyther-mac") - endif (UBrequiredfiles) -else (lipoexecutable) - message (FATAL_ERROR "Cannot find the 'lipo' program that is required for creating universal binaries") -endif (lipoexecutable) - diff --git a/src/build.sh b/src/build.sh index 07467b4..30b8316 100755 --- a/src/build.sh +++ b/src/build.sh @@ -8,7 +8,7 @@ PLATFORM=`uname` echo $PLATFORM if [ "$PLATFORM" = "Darwin" ] then - ./subbuild-mac-universal.sh + ./subbuild-mac-intel.sh else if [ "$PLATFORM" = "Linux" ] then diff --git a/src/subbuild-mac-universal.sh b/src/subbuild-mac-intel.sh similarity index 57% rename from src/subbuild-mac-universal.sh rename to src/subbuild-mac-intel.sh index bec0289..c86f068 100755 --- a/src/subbuild-mac-universal.sh +++ b/src/subbuild-mac-intel.sh @@ -3,15 +3,13 @@ # Default flags CMFLAGS="-D CMAKE_BUILD_TYPE:STRING=Release" -# Make for ppc and intel, and combine into universal binary -cmake $CMFLAGS -D TARGETOS=MacPPC . && make -cmake $CMFLAGS -D TARGETOS=MacIntel . && make -cmake $CMFLAGS . && make scyther-mac +# Make for intel +cmake $CMFLAGS -D TARGETOS=MacIntel . && make scyther-mac echo echo echo "---------------------------------------------------------" -echo "Built the Mac universal binary" +echo "Built the Mac intel binary" # Copy to the correct locations cp scyther-mac ../gui/Scyther/