aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-12-20 15:50:13 (GMT)
committerJouni Malinen <j@w1.fi>2008-12-20 15:50:13 (GMT)
commit2ae2d8aea4c287f18e02285985154fda92591d13 (patch)
tree5383d64d634627ee5cae981720aaf1073c623fbb /wpa_supplicant
parente6f9861ace44bc193dda827ebc3b498e4f273578 (diff)
downloadhostap-06-2ae2d8aea4c287f18e02285985154fda92591d13.zip
hostap-06-2ae2d8aea4c287f18e02285985154fda92591d13.tar.gz
hostap-06-2ae2d8aea4c287f18e02285985154fda92591d13.tar.bz2
Changed win_gui cross compilation to use cleaner Qt setup
A separate cross compiler mkspecs file (win32-x-g++) is now used to configure all build options so the setup-mingw-cross-compiling hack is not needed anymore. Furthermore, the MinGW setup is now on path, so no need to specify extra PATH changes for it.
Diffstat (limited to 'wpa_supplicant')
-rwxr-xr-xwpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling13
-rw-r--r--wpa_supplicant/wpa_gui-qt4/wpa_gui.pro7
2 files changed, 7 insertions, 13 deletions
diff --git a/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling b/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling
deleted file mode 100755
index b7d57f6..0000000
--- a/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# qmake seems to be forcing include and lib paths from the original build
-# and I have no idea how to change these. For now, just override the
-# directories in the Makefile.Release file after qmake run.
-
-qmake -spec /q/jm/qt4-win/4.3.3/mkspecs/win32-g++ wpa_gui.pro -o Makefile
-cat Makefile.Release |
- sed s%/usr/lib/qt4%/q/jm/qt4-win/4.3.3/lib%g |
- sed s%/usr/include/qt4%/q/jm/qt4-win/4.3.3/include%g > tmp.Makefile.Release &&
-mv -f tmp.Makefile.Release Makefile.Release
-
-make -C icons
diff --git a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
index 0de7752..5efc07f 100644
--- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
+++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
@@ -15,6 +15,13 @@ win32 {
DEFINES += CONFIG_NATIVE_WINDOWS CONFIG_CTRL_IFACE_NAMED_PIPE
SOURCES += ../../src/utils/os_win32.c
RESOURCES += icons_png.qrc
+} else:win32-x-g++ {
+ # cross compilation to win32
+ LIBS += -lws2_32 -static -mwindows
+ DEFINES += CONFIG_NATIVE_WINDOWS CONFIG_CTRL_IFACE_NAMED_PIPE
+ DEFINES += _X86_
+ SOURCES += ../../src/utils/os_win32.c
+ RESOURCES += icons_png.qrc
} else {
DEFINES += CONFIG_CTRL_IFACE_UNIX
SOURCES += ../../src/utils/os_unix.c