Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

64-bit and Ubuntu-related changes

  • Loading branch information...
commit 8e324bc97c540cbff47ec1e91ef8f5b25da83e04 1 parent 956f503
Andrey Turkin authored
View
16 external/build_externals_linux.sh
@@ -1,12 +1,14 @@
#!/bin/bash
if [ x"$1" == x"release" ] ; then
+ echo "Building release binaries"
output=`pwd`/out.release
cfg_switches=--disable-debug
tinyxml_switches="DEBUG=YES"
CPPFLAGS="-O2"
LDFLAGS="-g"
elif [ x"$1" == x"debug" ] ; then
+ echo "Building debug binaries"
output=`pwd`/out.debug
tinyxml_switches=
cfg_switches=--enable-debug
@@ -17,6 +19,18 @@ else
exit 1
fi
+LBITS=`getconf LONG_BIT`
+if [ x$LBITS == x"64" ] ; then
+ echo "Building 64-bit binaries"
+ WXWIDGETS_EXTRA_CFLAGS=
+elif [ x$LBITS == x"32" ] ; then
+ echo "Building 32-bit binaries"
+ WXWIDGETS_EXTRA_CFLAGS="-D_FILE_OFFSET_BITS=32"
+else
+ echo "Cannot determine target architecture"
+ exit 1
+fi
+
echo "Going to place output in $output"
if [[ ! -e $output ]]; then
@@ -74,7 +88,7 @@ popd
pushd wxwidgets
./configure --prefix=$output --enable-monolithic=yes --enable-shared=no --enable-unicode --enable-ffile \
--without-libtiff --enable-graphics_ctx $cfg_switches \
- --disable-largefile CPPFLAGS="$CPPCFLAGS -D_FILE_OFFSET_BITS=32" &&
+ --disable-largefile CPPFLAGS="$CPPCFLAGS $WXWIDGETS_EXTRA_CFLAGS" &&
make clean &&
make &&
make install ||
View
4 external/stuff/control.in
@@ -4,8 +4,8 @@ Section: editors
Priority: optional
Architecture: all
Essential: no
-Depends: gtk2, curl, sqlite3, libxml2, libxslt, libjpg, icu, cairo, openssl
-Installed-Size: 31000
+Depends: libxml2, openssl, libcurl3, libgtk2.0-0, libsqlite3-0, libxslt1.1, libjpeg62, libicu38, libcairo2, ruby
+Installed-Size: 62000
Maintainer: Alexander Stigsen [source@e-texteditor.com]
Provides: AlexanderStigsen
Description: e is a fast and elegant text editor with many innovative features.
View
2  linux-notes.txt
@@ -16,7 +16,7 @@ make DEBUG=1
If you choose to install packages manually, these are the Ubuntu packages required before building:
- build-essential
-- libwxgtk2.8-dev
+- libgtk2.0-dev
- libglib2.0-dev
- libatk1.0-dev
- libcurl-dev
Please sign in to comment.
Something went wrong with that request. Please try again.