Description: Adapt build configuration for Debian
Author: Ove Kaaven <ovek@arcticnet.no>
Forwarded: not-needed
Last-Update: 2011-29-05

Index: wine-gecko/wine/mozconfig
===================================================================
--- wine-gecko.orig/wine/mozconfig	2011-05-29 23:47:32.000000000 +0200
+++ wine-gecko/wine/mozconfig	2011-05-29 23:47:46.000000000 +0200
@@ -2,10 +2,11 @@
 
 ac_add_options --enable-application=xulrunner
 mk_add_options MOZ_CO_PROJECT=xulrunner
-ac_add_options --host=i486-pc-linux-gnu
-ac_add_options --target=i486-mingw32
+ac_add_options --host=`dpkg-architecture -qDEB_HOST_GNU_TYPE`
+ac_add_options --target=i686-w64-mingw32
+ac_add_options --enable-win32-target=WINNT
 ac_add_options --enable-default-toolkit=cairo-windows
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../wine_gecko
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/wine_gecko
 
 ac_add_options --disable-debug
 ac_add_options --disable-optimize
@@ -20,11 +21,9 @@
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-necko-wifi
 
-export CXXFLAGS=-DJS_ALWAYS_INLINE=inline
+export CFLAGS="-I${PWD}/../include -L${PWD}/../libs"
+export CXXFLAGS="-I${PWD}/../include -L${PWD}/../libs -DJS_ALWAYS_INLINE=inline"
+export CROSS_COMPILE=1
 
 #change this to where your libIDL-config file locate.
 HOST_LIBIDL_CONFIG=/usr/bin/libIDL-config-2
-
-GLIB_PREFIX=/usr/local/src/moztools
-LIBIDL_PREFIX=/usr/local/src/moztools
-
Index: wine-gecko/wine/mozconfig-browser
===================================================================
--- wine-gecko.orig/wine/mozconfig-browser	2011-05-29 23:47:32.000000000 +0200
+++ wine-gecko/wine/mozconfig-browser	2011-05-29 23:47:52.000000000 +0200
@@ -2,10 +2,11 @@
 
 ac_add_options --enable-application=browser
 mk_add_options MOZ_CO_PROJECT=xulrunner
-ac_add_options --host=i486-pc-linux-gnu
-ac_add_options --target=i486-mingw32
+ac_add_options --host=`dpkg-architecture -qDEB_HOST_GNU_TYPE`
+ac_add_options --target=i686-w64-mingw32
+ac_add_options --enable-win32-target=WINNT
 ac_add_options --enable-default-toolkit=cairo-windows
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../mozilla-build
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/mozilla-build
 
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
@@ -20,11 +21,9 @@
 ac_add_options --disable-javaxpcom
 ac_add_options --enable-extensions=layout-debug
 
-export CXXFLAGS=-DJS_ALWAYS_INLINE=inline
+export CFLAGS="-I${PWD}/../include -L${PWD}/../libs"
+export CXXFLAGS="-I${PWD}/../include -L${PWD}/../libs -DJS_ALWAYS_INLINE=inline"
+export CROSS_COMPILE=1
 
 #change this to where your libIDL-config file locate.
 HOST_LIBIDL_CONFIG=/usr/bin/libIDL-config-2
-
-GLIB_PREFIX=/usr/local/src/moztools
-LIBIDL_PREFIX=/usr/local/src/moztools
-
Index: wine-gecko/wine/mozconfig-dbg
===================================================================
--- wine-gecko.orig/wine/mozconfig-dbg	2011-05-29 23:47:32.000000000 +0200
+++ wine-gecko/wine/mozconfig-dbg	2011-05-29 23:47:58.000000000 +0200
@@ -2,10 +2,11 @@
 
 ac_add_options --enable-application=xulrunner
 mk_add_options MOZ_CO_PROJECT=xulrunner
-ac_add_options --host=i486-pc-linux-gnu
-ac_add_options --target=i486-mingw32
+ac_add_options --host=`dpkg-architecture -qDEB_HOST_GNU_TYPE`
+ac_add_options --target=i686-w64-mingw32
+ac_add_options --enable-win32-target=WINNT
 ac_add_options --enable-default-toolkit=cairo-windows
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../wine_gecko-dbg
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/wine_gecko-dbg
 
 ac_add_options --enable-debug
 ac_add_options --disable-optimize
@@ -20,11 +21,9 @@
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-necko-wifi
 
-export CXXFLAGS=-DJS_ALWAYS_INLINE=inline
+export CFLAGS="-I${PWD}/../include -L${PWD}/../libs"
+export CXXFLAGS="-I${PWD}/../include -L${PWD}/../libs -DJS_ALWAYS_INLINE=inline"
+export CROSS_COMPILE=1
 
 #change this to where your libIDL-config file locate.
 HOST_LIBIDL_CONFIG=/usr/bin/libIDL-config-2
-
-GLIB_PREFIX=/usr/local/src/moztools
-LIBIDL_PREFIX=/usr/local/src/moztools
-
