X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tools%2Fmake%2Fc_configure.sh;h=f2e5bcd1105b1c3336ff5180dbae87a95f1e0237;hb=ede7ea996ee0d38c82d41652bf2fb2a264aaf934;hp=16a0822ad9b6a8d45014d97a3bc64b1bc1f1e944;hpb=8aa3f75cc1f16a25491abc5cd8a4ed554ad26f0d;p=projects.git

diff --git a/tools/make/c_configure.sh b/tools/make/c_configure.sh
index 16a0822..f2e5bcd 100755
--- a/tools/make/c_configure.sh
+++ b/tools/make/c_configure.sh
@@ -30,12 +30,14 @@ function install_cpp_make {
 		echo "CC = arm-linux-gnueabi-g++" >> make.pre
 		echo "CXXFLAGS += -D_ARMEL" >> make.pre
 		echo 'export PATH := /opt/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/:/opt/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/bin/armv5te-linux-gnueabi/:$(PATH)' >> make.pre
+	else
+		echo "CXXFLAGS += -std=c++0x" >> make.pre
 	fi
-	echo "CXXFLAGS += -std=c++0x -I$src/util" >> make.pre
 	popd
 }
 
 function append_dependency {
+# adds another drectory, where a c++ compile is performed
 # parameter:
 # $1: main directory
 # $2: dependency directory
@@ -49,6 +51,7 @@ function append_dependency {
 }
 
 function append_library {
+# same as append_dependency. In addition a include statement + a link to the library is added to "main directory"
 # parameter:
 # $1: main directory
 # $2: dependency directory
@@ -57,6 +60,7 @@ function append_library {
 	src=$(pwd)
 	echo "DEPS += $3" >> $1/make.pre
 	echo "LDLIBS += $3" >> $1/make.pre
+	echo "CXXFLAGS += -I$src/$2" >> $1/make.pre
 	echo "$3:" >> $1/make.post
 	echo "	cd $src/$2 && make TARGET=$3" >> $1/make.post
 	echo "	ln -sf $src/$2/$3 ." >> $1/make.post