cpp32

diff --git a/debian/eldk-5.0.cp b/debian/eldk-5.0.cp
index bafc801aad9913271ce1b928d7b11a9c0d6c6766..4b34bca9e1c5303e75dc5178c36847ff50f72fc2 100755 (executable)
--- a/debian/eldk-5.0.cp
+++ b/debian/eldk-5.0.cp
@@ -1,6 +1,9 @@
 #!/bin/bash
 
+mkdir -p $1/opt/eldk-5.0
+rsync -a ../build/eldk-5.0/armv5te $1/opt/eldk-5.0
 mkdir -p $1/opt/cross/eldk-5.0
-rsync -a ../build/eldk-5.0/armv5te $1/opt/cross/eldk-5.0
 cp eldk-5.0/toolset.cmake $1/opt/cross/eldk-5.0/
 cp eldk-5.0/setenv.sh $1/opt/cross/eldk-5.0/
+ln -s /opt/eldk-5.0/armv5te $1/opt/cross/eldk-5.0/
+

diff --git a/eldk-5.0/toolset.cmake b/eldk-5.0/toolset.cmake
index 3dac072cf87a53dc21a6293779c532a960f6dfe5..958af67373d5e1e872d9cb1a39bfdcba2d78514b 100644 (file)
--- a/eldk-5.0/toolset.cmake
+++ b/eldk-5.0/toolset.cmake
@@ -1,17 +1,17 @@
 # Define our host system
 SET(CMAKE_SYSTEM_NAME Linux)
 SET(CMAKE_SYSTEM_VERSION 1)# Define the cross compiler locations
-SET(CMAKE_C_COMPILER   /opt/cross/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-gcc)
-SET(CMAKE_CXX_COMPILER /opt/cross/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-g++)
-SET(CMAKE_FIND_ROOT_PATH /opt/cross/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/)
+SET(CMAKE_C_COMPILER   /opt/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-gcc)
+SET(CMAKE_CXX_COMPILER /opt/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-g++)
+SET(CMAKE_FIND_ROOT_PATH /opt/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/)
 
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 # Search for libraries and headers in the target directories only
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 add_definitions(-Wall)
-set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -D_ARMEL --sysroot=/opt/cross/eldk-5.0/armv5te/sysroots/arm-linux-gnueabi/" )
-set( CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} --sysrooot=/opt/cross/eldk-5.0/armv5te/sysroots/arm-linux-gnueabi/" )
-set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Icross/include -Icross/arm-linux-gnueabi/include" )
-link_directories(${CMAKE_HOME_DIRECTORY}/cross/arm-linux-gnueabi/lib)
+set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -D_ARMEL --sysroot=/opt/eldk-5.0/armv5te/sysroots/arm-linux-gnueabi/" )
+set( CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} --sysrooot=/opt/eldk-5.0/armv5te/sysroots/arm-linux-gnueabi/" )
+set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Icross/include -Icross/armv5te-linux-gnueabi/include" )
+link_directories(${CMAKE_HOME_DIRECTORY}/cross/armv5te-linux-gnueabi/lib)