Mercurial > mxe-octave

changeset 4484:0d0e6c8015af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qtbase.mk: Use proper platform option for cross and native windows builds.
author John W. Eaton <jwe@octave.org>
date Tue, 03 Oct 2017 11:27:47 -0400
parents 93c4bd7acd4b
children 86176b88d1f8
files src/qtbase.mk
diffstat 1 files changed, 15 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/qtbase.mk	Mon Oct 02 15:29:40 2017 -0400
+++ b/src/qtbase.mk	Tue Oct 03 11:27:47 2017 -0400
@@ -25,6 +25,15 @@
 $(PKG)_CONFIGURE_LIBPATH_OPTION :=
 $(PKG)_CONFIGURE_PLATFORM_OPTION :=
 
+## These are needed whether cross compiling or not.
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32"
+  $(PKG)_CONFIGURE_DATABASE_OPTION += \
+    -system-sqlite -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql
+else
+  $(PKG)_CONFIGURE_DATABASE_OPTION += -system-sqlite
+endif
+
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)'
   $(PKG)_CONFIGURE_LIBPATH_OPTION += -L '$(HOST_LIBDIR)'
@@ -33,18 +42,15 @@
   endif
   $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_INCDIR)/dbus-1.0'
   $(PKG)_CONFIGURE_INCLUDE_OPTION += -I '$(HOST_LIBDIR)/dbus-1.0/include'
+  ifeq ($(MXE_WINDOWS_BUILD),yes)
+    $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++
+  endif
 else
   $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := \
     -device-option CROSS_COMPILE=$(MXE_TOOL_PREFIX)
-endif
-
-ifeq ($(MXE_WINDOWS_BUILD),yes)
-  $(PKG)_CONFIGURE_ENV := PSQL_LIBS="-lpq -lsecur32 -lws2_32"
-  $(PKG)_CONFIGURE_PLATFORM_OPTION := -platform win32-g++
-  $(PKG)_CONFIGURE_DATABASE_OPTION += \
-    -system-sqlite -plugin-sql-sqlite -plugin-sql-odbc -plugin-sql-psql
-else
-  $(PKG)_CONFIGURE_DATABASE_OPTION += -system-sqlite
+  ifeq ($(MXE_WINDOWS_BUILD),yes)
+    $(PKG)_CONFIGURE_PLATFORM_OPTION := -xplatform win32-g++
+  endif
 endif
 
 define $(PKG)_BUILD