SGJP / Morfeusz

Commit 94f296fa4f0163a8cd7eaf66e72d6540b3353818

Authored by Marcin Woliński
1 parent f02da332

dostosowanie Toolchain-Darwin-amd64.cmake 

do naszego antycznego cross-compilera, który ma INSTALL_PREFIX=/usr
nie wiedzieć czemu i koniecznie musi tamże być wgrany, albo się będzie
niezrozumiale wywalał
Inline Side-by-side
Showing 1 changed file with 5 additions and 3 deletions
toolchains/Toolchain-Darwin-amd64.cmake
  View file @94f296f
... ... @@ -3,7 +3,7 @@ set (DARWIN64_ROOT ${CROSSMORFEUSZ_ROOT}/darwin64)
3 3  
4 4 set (CMAKE_SYSTEM_NAME Darwin)
5 5 set (CMAKE_SYSTEM_VERSION 1)
6   -set (CMAKE_C_COMPILER ${DARWIN64_ROOT}/x86_64-apple-darwin9/bin/x86_64-apple-darwin9-gcc)
  6 +set (CMAKE_C_COMPILER /usr/x86_64-apple-darwin9/bin/x86_64-apple-darwin9-gcc)
7 7 set (CMAKE_CXX_COMPILER /usr/x86_64-apple-darwin9/bin/x86_64-apple-darwin9-g++)
8 8  
9 9 set (CMAKE_SYSTEM_PROCESSOR "x86_64")
... ... @@ -19,7 +19,7 @@ endif()
19 19 set (INSTALL_NAME_TOOL /usr/x86_64-apple-darwin9/bin/x86_64-apple-darwin9-install_name_tool)
20 20  
21 21 # here is the target environment located
22   -set (CMAKE_FIND_ROOT_PATH ${DARWIN64_ROOT}/x86_64-apple-darwin9 ${JAVA_ROOT} ${PYTHON_ROOT})
  22 +set (CMAKE_FIND_ROOT_PATH /usr/x86_64-apple-darwin9 ${JAVA_ROOT} ${PYTHON_ROOT})
23 23  
24 24 # adjust the default behaviour of the FIND_XXX() commands:
25 25 # search headers and libraries in the target environment, search
... ... @@ -30,4 +30,6 @@ set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
30 30  
31 31 set (JAVA_JVM_LIBRARY ${JAVA_ROOT})
32 32 set (JAVA_AWT_LIBRARY ${JAVA_ROOT})
33   -set (JAVA_INCLUDE_PATH ${JAVA_ROOT}/Headers)
  33 +set (JAVA_INCLUDE_PATH ${JAVA_ROOT}/Headers) # the include path to jni.h
  34 +set (JAVA_INCLUDE_PATH2 ${JAVA_ROOT}/Headers) # the include path to jni_md.h
  35 +set (JAVA_AWT_INCLUDE_PATH ${JAVA_ROOT}/Headers) # the include path to jawt.h
... ...