Rename cross directory into files
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 31 May 2012 09:37:05 +0000 (11:37 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Thu, 31 May 2012 09:37:05 +0000 (11:37 +0200)
Add more explanation to android crosscompile file
move example config to files

README-compilation.txt
files/README-crosscompile.txt [moved from cross/README-crosscompile.txt with 57% similarity]
files/android_on_linux.cmake [moved from cross/android_on_linux.cmake with 55% similarity]
files/check_licences.sh [moved from cross/check_licences.sh with 100% similarity]
files/default_licence.txt [moved from cross/default_licence.txt with 100% similarity]
files/example_config.txt [moved from config.txt with 100% similarity]
files/llvm-clang.cmake [moved from cross/llvm-clang.cmake with 91% similarity]
files/win32_on_linux.cmake [moved from cross/win32_on_linux.cmake with 92% similarity]

index 755604a..a32428e 100644 (file)
@@ -1,5 +1,3 @@
-
-
 Prerequisites
 ==============
 
@@ -7,10 +5,19 @@ Install:
 
 cmake
 gcc
+gnu-make
+
+
+Building (quick way)
+====================
+
 make
 
 
-Building
-==============
+Building (the cmake way)
+========================
 
+mkdir build
+cd build
+cmake ..
 make
similarity index 57%
rename from cross/README-crosscompile.txt
rename to files/README-crosscompile.txt
index 69a5124..e33ec66 100644 (file)
@@ -5,9 +5,9 @@ Crosscompilation with CMake is not really difficult.
 mkdir build-android
 cd build-android
 
-2) then run cmake with the right crosscompile template (see /cross for examples)
+2) then run cmake with the right crosscompile template (see /files for examples)
 
-cmake -D CMAKE_TOOLCHAIN_FILE=../cross/android_on_linux.cmake ..
+cmake -D CMAKE_TOOLCHAIN_FILE=../files/android_on_linux.cmake ..
 
 3) start building
 
similarity index 55%
rename from cross/android_on_linux.cmake
rename to files/android_on_linux.cmake
index 835af4b..2eae239 100644 (file)
@@ -1,3 +1,12 @@
+# to use this file, create a build-android directory,
+# change into the directory and run cmake there:
+#
+# > mkdir build-android
+# > cd build-android
+# > cmake -DCMAKE_TOOLCHAIN_FILE=../files/android_on_linux.cmake ..
+# > make
+
+
 SET(CMAKE_SYSTEM_NAME Linux)  # Tell CMake we're cross-compiling
 include(CMakeForceCompiler)
 
@@ -6,4 +15,3 @@ include(CMakeForceCompiler)
 CMAKE_FORCE_C_COMPILER(arm-linux-androideabi-gcc GNU)
 
 SET(ANDROID TRUE)
-
similarity index 100%
rename from config.txt
rename to files/example_config.txt
similarity index 91%
rename from cross/llvm-clang.cmake
rename to files/llvm-clang.cmake
index 0e1ebe5..631232b 100644 (file)
@@ -3,7 +3,7 @@
 #
 # > mkdir build-clang
 # > cd build-clang
-# > cmake -DCMAKE_TOOLCHAIN_FILE=../cross/llvm-clang.cmake ..
+# > cmake -DCMAKE_TOOLCHAIN_FILE=../files/llvm-clang.cmake ..
 # > make
 
 # which compilers to use for C and C++
similarity index 92%
rename from cross/win32_on_linux.cmake
rename to files/win32_on_linux.cmake
index f5da996..8a63b53 100644 (file)
@@ -3,7 +3,7 @@
 #
 # > mkdir build-win32
 # > cd build-win32
-# > cmake -DCMAKE_TOOLCHAIN_FILE=../cross/win32_on_linux.cmake ..
+# > cmake -DCMAKE_TOOLCHAIN_FILE=../files/win32_on_linux.cmake ..
 # > make
 
 # the name of the target operating system