[Orxonox-commit 6459] r127 - windows/precompiled_dependencies/mingw64

[landauf at orxonox.net]

Author: landauf
Date: 2016-02-14 11:25:22 +0100 (Sun, 14 Feb 2016)
New Revision: 127

Modified:
   windows/precompiled_dependencies/mingw64/build_boost.sh
   windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh
   windows/precompiled_dependencies/mingw64/build_lua.sh
   windows/precompiled_dependencies/mingw64/build_ogre.sh
   windows/precompiled_dependencies/mingw64/build_ogredeps.sh
   windows/precompiled_dependencies/mingw64/build_tcl.sh
   windows/precompiled_dependencies/mingw64/build_xerces.sh
Log:
fixed some target paths for cp -aT
fixed cleaning boost
+ some details

Modified: windows/precompiled_dependencies/mingw64/build_boost.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_boost.sh	2016-02-13 22:18:12 UTC (rev 126)
+++ windows/precompiled_dependencies/mingw64/build_boost.sh	2016-02-14 10:25:22 UTC (rev 127)
@@ -15,8 +15,16 @@
 	check_result $? "cleaning build dir"
 	rm -rf $STAGE_DIR
 	check_result $? "cleaning stage dir"
+	rm -rf "bin.v2"
+	check_result $? "cleaning dist dir"
 	rm -rf "dist"
 	check_result $? "cleaning dist dir"
+	rm -rf "tools/build/src/engine/bin.ntx86"
+	check_result $? "cleaning dist dir"
+	rm -rf "tools/build/src/engine/bootstrap"
+	check_result $? "cleaning dist dir"
+	rm -rf "libs/config/checks/architecture/bin"
+	check_result $? "cleaning dist dir"
 	rm -rf $TEMP_INC_DIR
 	check_result $? "cleaning temp include dir"
 fi
@@ -52,7 +60,7 @@
 	# copy includes
 	mkdir -p ${TARGET_INC_DIR}/boost
 	check_result $? "creating include dir"
-	cp -aT ${TEMP_INC_DIR}/boost ${TARGET_INC_DIR}/boost/
+	cp -aT ${TEMP_INC_DIR}/boost ${TARGET_INC_DIR}/boost/boost
 	check_result $? "copying includes"
 
 	echo "${NAME} Finished building ${NAME}"

Modified: windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh	2016-02-13 22:18:12 UTC (rev 126)
+++ windows/precompiled_dependencies/mingw64/build_cegui-0-7.sh	2016-02-14 10:25:22 UTC (rev 127)
@@ -33,6 +33,9 @@
 	check_result $? "copy bins"
 	cp -aT "${TEMP_DIR}/ogredeps/lib/Release" "dependencies/lib"
 	check_result $? "copy libs"
+	
+	# create subdirectory to fix an include path in premake script
+	mkdir -p "cegui/include/ScriptingModules/LuaScriptModule/support/tolua++bin"
 
 	cd projects/premake
 

Modified: windows/precompiled_dependencies/mingw64/build_lua.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_lua.sh	2016-02-13 22:18:12 UTC (rev 126)
+++ windows/precompiled_dependencies/mingw64/build_lua.sh	2016-02-14 10:25:22 UTC (rev 127)
@@ -33,7 +33,7 @@
 	# copy headers
 	mkdir -p "${TARGET_INC_DIR}/lua"
 	check_result $? "create include dir"
-	cp -aT $HEADER_DIR "${TARGET_INC_DIR}/lua"
+	cp -aT $HEADER_DIR "${TARGET_INC_DIR}/lua/include"
 	check_result $? "copying includes"
 
 	# add to ceguideps

Modified: windows/precompiled_dependencies/mingw64/build_ogre.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_ogre.sh	2016-02-13 22:18:12 UTC (rev 126)
+++ windows/precompiled_dependencies/mingw64/build_ogre.sh	2016-02-14 10:25:22 UTC (rev 127)
@@ -17,6 +17,8 @@
 if [ $DO_BUILD -eq 1 ]
 then
 	# modify sources to make it work with mingw64
+	sed -i "s/ -march=i686//" "CMakeLists.txt"
+	check_result $? "remove compiler flag -march=i686"
 	sed -i "s/DxErr/dxerr9/" "CMake/Packages/FindDirectX.cmake"
 	check_result $? "renaming DxErr library in FindDirectX.cmake"
 	sed -i "s/#define __uuidof(Object) IID_##Object//" "OgreMain/include/WIN32/OgreMinGWSupport.h"

Modified: windows/precompiled_dependencies/mingw64/build_ogredeps.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_ogredeps.sh	2016-02-13 22:18:12 UTC (rev 126)
+++ windows/precompiled_dependencies/mingw64/build_ogredeps.sh	2016-02-14 10:25:22 UTC (rev 127)
@@ -51,7 +51,7 @@
 	check_result $? "copying zlib.h"
 
 	# copy whole dependency folder to TEMP_DIR for future build steps (i.e. ogre)
-	cp -aT "ogredeps" "${TEMP_DIR}"
+	cp -aT "ogredeps" "${TEMP_DIR}/ogredeps"
 	check_result $? "copying dependencies to TEMP_DIR"
 
 	echo "${NAME} Finished building ${NAME}"

Modified: windows/precompiled_dependencies/mingw64/build_tcl.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_tcl.sh	2016-02-13 22:18:12 UTC (rev 126)
+++ windows/precompiled_dependencies/mingw64/build_tcl.sh	2016-02-14 10:25:22 UTC (rev 127)
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 NAME="[tcl]"
-WORKING_DIR="tcl/tcl8.6.4"
+WORKING_DIR="tcl/tcl8.5.19"
+#WORKING_DIR="tcl/tcl8.6.4"
 
 source ./build_common.sh
 

Modified: windows/precompiled_dependencies/mingw64/build_xerces.sh
===================================================================
--- windows/precompiled_dependencies/mingw64/build_xerces.sh	2016-02-13 22:18:12 UTC (rev 126)
+++ windows/precompiled_dependencies/mingw64/build_xerces.sh	2016-02-14 10:25:22 UTC (rev 127)
@@ -29,7 +29,7 @@
 	
 	cp -a "src/.libs/libxerces-c.a" "${TEMP_DIR}/ceguideps/lib"
 	check_result $? "copy lib"
-	cp -aT "src/xercesc" "${TEMP_DIR}/ceguideps/include"
+	cp -aT "src/xercesc" "${TEMP_DIR}/ceguideps/include/xercesc"
 	check_result $? "copy includes"
 
 	echo "${NAME} Finished building ${NAME}"