2.4.5 release

MTG · Apr 19, 2018 · 95f4851 · 95f4851
1 parent 1d593b8
commit 95f4851
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.4.4
+2.4.5
diff --git a/packaging/darwin/Gaia2lib/Gaia2lib.pro b/packaging/darwin/Gaia2lib/Gaia2lib.pro
@@ -7,7 +7,7 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 DEFINES += YAML_DECLARE_STATIC \
-           GAIA_VERSION=\\\"2.4.4\\\"
+           GAIA_VERSION=\\\"2.4.5\\\"
 
 win32:INCLUDEPATH = $$quote(C:/Documents and Settings/Build Bot/build-space/gaia2-thirdparty/include) \
                     $$quote(C:/Documents and Settings/Build Bot/build-space/gaia2-thirdparty/yaml-0.1.3/include) \

diff --git a/packaging/win32/Gaia2lib/Gaia2lib.pro b/packaging/win32/Gaia2lib/Gaia2lib.pro
@@ -7,7 +7,7 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 DEFINES += YAML_DECLARE_STATIC \
-    GAIA_VERSION=\\\"2.4.4\\\"
+    GAIA_VERSION=\\\"2.4.5\\\"
 
 INCLUDEPATH = ../../../../gaia2-thirdparty/include \
     ../../../../gaia2-thirdparty/yaml-0.1.3/include \

diff --git a/wscript b/wscript
@@ -48,6 +48,11 @@ def options(opt):
                    dest='MODE', default="release",
                    help='debug or release')
 
+    opt.add_option('--cross-compile-mingw32', action='store_true',
+                   dest='CROSS_COMPILE_MINGW32', default=False,
+                   help='cross-compile for windows using mingw32 on linux')
+
+
 
 def debian_version():
     try:
@@ -147,6 +152,20 @@ def configure(conf):
         # the cflags properly set
         conf.env.CXXFLAGS += [ '-I/usr/local/include' ]
 
+    if conf.options.CROSS_COMPILE_MINGW32:
+        #print("→ Cross-compiling for Windows with MinGW: search for pre-built dependencies in 'packaging/win32_3rdparty'")
+        #os.environ["PKG_CONFIG_PATH"] = 'packaging/win32_3rdparty/lib/pkgconfig'
+        #os.environ["PKG_CONFIG_LIBDIR"] = os.environ["PKG_CONFIG_PATH"]
+
+        # locate MinGW compilers and use them
+        conf.find_program('i686-w64-mingw32-gcc', var='CC')
+        conf.find_program('i686-w64-mingw32-g++', var='CXX')
+        conf.find_program('i686-w64-mingw32-ar', var='AR')
+
+        # compile libgcc and libstd statically when using MinGW
+        conf.env.CXXFLAGS = ['-static-libgcc', '-static-libstdc++']
+
+
     conf.load('compiler_cxx compiler_c qt4')
 
     #conf.env['LINKFLAGS'] += [ '--as-needed' ] # TODO do we need this flag?