From c0591e981541c642ed913e671889988bed035a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 25 Jan 2011 20:26:29 +0100 Subject: [PATCH] Add cross compilation support --- ChangeLog | 3 ++- Makefile | 13 ++++++++----- tools/package.sh | 6 +++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 422cb9e..a18d440 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -v0.2_dev (23/01/2011) +v0.2_dev (25/01/2011) ** User ** Better use of sizers (so better interface!) @@ -7,6 +7,7 @@ v0.2_dev (23/01/2011) ** Dev ** Use a factory to create panels (prepare for plug-in) + Better cross compilation support (Makefile and package.sh) ** Bugs ** Bug on GenerateMonth with different years diff --git a/Makefile b/Makefile index d753805..d110e41 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ -CXXFLAGS=`wx-config --cxxflags` -Wall -Isrc -ggdb +CXXFLAGS+=`wx-config --cxxflags` -Wall -Isrc -ggdb CXXFLAGS+=-I./lib/wxsqlite3-1.9.9/include CXXFLAGS+=-I./lib/freechart/include -LDFLAGS=`wx-config --libs` +LDFLAGS+=`wx-config --libs` LDFLAGS+=-L./lib/wxsqlite3-1.9.9/lib/ -lwxcode_gtk2u_wxsqlite3-2.8 LDFLAGS+=-L./lib/freechart/lib -lwxcode_gtk2u_freechart-2.8 -CXX=g++ +CXX=$(PREFIX)g++ SOURCES=$(wildcard src/model/*.cpp) SOURCES+=$(wildcard src/view/*.cpp) @@ -34,5 +34,8 @@ check: kc: $(OBJS) $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) -generate_locals: - ./generate_locales.sh +generate_locales: + ./tools/generate_locales.sh + +package: + ./tools/package.sh diff --git a/tools/package.sh b/tools/package.sh index f4ec3bc..b0685a5 100755 --- a/tools/package.sh +++ b/tools/package.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%d.%m.%Y` -ARCH=`uname -m` +ARCH=`${PREFIX}gcc -dumpmachine | cut -d- -f1` VERSION=`cat src/controller/KissCount.h | grep APP_VERSION | cut -d\" -f2` DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}" FILE="$DIR.tar.bz2" @@ -15,7 +15,7 @@ make || (echo "Compilation failed" ; exit 1) mkdir -p "$DIR"/lib cp -r lib/freechart/lib/*.so* lib/wxsqlite3-1.9.9/lib/*.so* "$DIR"/lib cp -r kc init.sql ressources tools/launch_kc.sh TODO CONTRIBUTORS COPYING README README.fr www "$DIR" -find "$DIR" -type f -executable -exec strip \{\} \; +find "$DIR" -type f -executable -exec ${PREFIX}strip \{\} \; tar -jcf "$FILE" "$DIR" rm -rf "$DIR" -echo "Packaged !" \ No newline at end of file +echo "Packaged into $FILE !" \ No newline at end of file