mirror of
https://github.com/autc04/Retro68.git
synced 2024-12-12 11:29:30 +00:00
ad boost include directory in CMakeLists, and, as a hack force use of /usr/local/include
# Conflicts: # build-toolchain.sh
This commit is contained in:
parent
6a76b6e593
commit
0f2c7307c2
@ -6,5 +6,6 @@ add_executable(MakePEF MakePEF.cc rs6000.h PEF.h)
|
||||
|
||||
add_executable(MakeImport MakeImport.cc PEF.h)
|
||||
target_link_libraries(MakeImport ResourceFiles ${Boost_LIBRARIES})
|
||||
target_include_directories(MakeImport PRIVATE ${Boost_INCLUDE_DIR})
|
||||
|
||||
install(TARGETS MakePEF MakeImport RUNTIME DESTINATION bin)
|
||||
|
@ -29,5 +29,5 @@ add_library(ResourceFiles
|
||||
|
||||
target_link_libraries(ResourceFiles ${Boost_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib/libhfs.a)
|
||||
target_include_directories(ResourceFiles PUBLIC .
|
||||
PRIVATE ${CMAKE_INSTALL_PREFIX}/include)
|
||||
|
||||
PRIVATE ${CMAKE_INSTALL_PREFIX}/include
|
||||
${Boost_INCLUDE_DIR})
|
||||
|
@ -71,11 +71,13 @@ add_library(RezLib
|
||||
Diagnostic.h Diagnostic.cc
|
||||
)
|
||||
target_link_libraries(RezLib ResourceFiles ${Boost_LIBRARIES})
|
||||
target_include_directories(RezLib PRIVATE ${Boost_INCLUDE_DIR})
|
||||
|
||||
add_executable(Rez
|
||||
Rez.cc
|
||||
)
|
||||
target_link_libraries(Rez RezLib ResourceFiles ${Boost_LIBRARIES})
|
||||
target_include_directories(Rez PRIVATE ${Boost_INCLUDE_DIR})
|
||||
|
||||
install(TARGETS Rez RUNTIME DESTINATION bin)
|
||||
|
||||
|
@ -2,3 +2,4 @@ set(CMAKE_CXX_FLAGS "--std=c++11 -Wall -Wno-multichar")
|
||||
find_package(Boost COMPONENTS unit_test_framework)
|
||||
add_executable(RezUnitTests UnitTests.cc)
|
||||
target_link_libraries(RezUnitTests RezLib ${Boost_LIBRARIES})
|
||||
target_include_directories(RezUnitTests PRIVATE ${Boost_INCLUDE_DIR})
|
||||
|
@ -64,10 +64,13 @@ if [ $CMAKEONLY != true ]; then
|
||||
rm -rf toolchain
|
||||
mkdir -p toolchain
|
||||
|
||||
export CPPFLAGS="-I/usr/local/include"
|
||||
export LDFLAGS="-L/usr/local/lib"
|
||||
|
||||
if [ $BUILD_68K != false ]; then
|
||||
|
||||
export "CFLAGS=-Wno-error"
|
||||
|
||||
# Build binutils for 68K
|
||||
mkdir -p binutils-build
|
||||
cd binutils-build
|
||||
@ -140,7 +143,7 @@ rm -rf hfsutils
|
||||
cp -r $SRC/hfsutils .
|
||||
cd hfsutils
|
||||
./configure --prefix=$PREFIX --enable-devlibs
|
||||
make
|
||||
make
|
||||
make install
|
||||
cd ..
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user