Major rearrangement of build-toolchain.sh; interfaces & libraries now…

… taken from InterfacesAndLibraries/
autc04 · Apr 25, 2017 · 0e11f29 · 0e11f29
1 parent a2dced7
commit 0e11f29
Show file tree

Hide file tree

Showing 5 changed files with 416 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ Universal Headers*
 .*.swp
 CMakeLists.txt.user
 .finf
+InterfacesAndLibraries
diff --git a/PEFTools/CMakeLists.txt b/PEFTools/CMakeLists.txt
@@ -3,9 +3,11 @@ set(CMAKE_CXX_FLAGS "--std=c++11 -Wall -Werror=return-type -Wno-multichar")
 find_package(Boost COMPONENTS filesystem system REQUIRED)
 
 add_executable(MakePEF MakePEF.cc rs6000.h PEF.h)
+target_include_directories(MakePEF PRIVATE ${CMAKE_INSTALL_PREFIX}/include)
 
 add_executable(MakeImport MakeImport.cc PEF.h)
 target_link_libraries(MakeImport ResourceFiles ${Boost_LIBRARIES})
 target_include_directories(MakeImport PRIVATE ${Boost_INCLUDE_DIR})
+target_include_directories(MakeImport PRIVATE ${CMAKE_INSTALL_PREFIX}/include)
 
 install(TARGETS MakePEF MakeImport RUNTIME DESTINATION bin)
diff --git a/PEFTools/PEF.h b/PEFTools/PEF.h
@@ -40,7 +40,7 @@ typedef void *LogicalAddress;
 typedef struct {} FSSpec, *FSSpecPtr;
 
 /* Definitions for PEF, from Apple's Universal Interfaces */
-#include "../CIncludes/PEFBinaryFormat.h"
+#include "PEFBinaryFormat.h"
 
 /* Deal with differences between versions of PEFBinaryFormat.h */
 #ifndef PEFRelocComposeSetPosition_1st