soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

Add cross compilation support

Browse Source
This commit is contained in:
Grégory Soutadé 2011-01-25 20:26:29 +01:00
parent 90994542c3
commit c0591e9815
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,5 @@
v0.2_dev (23/01/2011) v0.2_dev (25/01/2011)
** User ** ** User **
Better use of sizers (so better interface!) Better use of sizers (so better interface!)
@ -7,6 +7,7 @@ v0.2_dev (23/01/2011)
** Dev ** ** Dev **
Use a factory to create panels (prepare for plug-in) Use a factory to create panels (prepare for plug-in)
Better cross compilation support (Makefile and package.sh)
** Bugs ** ** Bugs **
Bug on GenerateMonth with different years Bug on GenerateMonth with different years

13
Makefile
View File

@ -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/wxsqlite3-1.9.9/include
CXXFLAGS+=-I./lib/freechart/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/wxsqlite3-1.9.9/lib/ -lwxcode_gtk2u_wxsqlite3-2.8
LDFLAGS+=-L./lib/freechart/lib -lwxcode_gtk2u_freechart-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/model/*.cpp)
SOURCES+=$(wildcard src/view/*.cpp) SOURCES+=$(wildcard src/view/*.cpp)
@ -34,5 +34,8 @@ check:
kc: $(OBJS) kc: $(OBJS)
$(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(CXX) $(CXXFLAGS) $^ -o $@ $(LDFLAGS)
generate_locals: generate_locales:
./generate_locales.sh ./tools/generate_locales.sh
package:
./tools/package.sh

6
tools/package.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
DATE=`date +%d.%m.%Y` 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` VERSION=`cat src/controller/KissCount.h | grep APP_VERSION | cut -d\" -f2`
DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}" DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}"
FILE="$DIR.tar.bz2" FILE="$DIR.tar.bz2"
@ -15,7 +15,7 @@ make || (echo "Compilation failed" ; exit 1)
mkdir -p "$DIR"/lib mkdir -p "$DIR"/lib
cp -r lib/freechart/lib/*.so* lib/wxsqlite3-1.9.9/lib/*.so* "$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" 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" tar -jcf "$FILE" "$DIR"
rm -rf "$DIR" rm -rf "$DIR"
echo "Packaged !" echo "Packaged into $FILE !"