Browse Source

Merge pull request #299 from bruvzg/macos_mingw

Fix MinGW-w64 cross-compilation on macOS.
Thomas Herzog 6 years ago
parent
commit
0220045268
1 changed files with 8 additions and 2 deletions
  1. 8 2
      SConstruct

+ 8 - 2
SConstruct

@@ -151,15 +151,21 @@ elif env['platform'] == 'windows':
         elif env['target'] == 'release':
         elif env['target'] == 'release':
             env.Append(CCFLAGS=['/O2', '/EHsc', '/DNDEBUG', '/MD'])
             env.Append(CCFLAGS=['/O2', '/EHsc', '/DNDEBUG', '/MD'])
 
 
-    elif host_platform == 'linux':
+    elif host_platform == 'linux' or host_platform == 'osx':
         # Cross-compilation using MinGW
         # Cross-compilation using MinGW
         if env['bits'] == '64':
         if env['bits'] == '64':
             env['CXX'] = 'x86_64-w64-mingw32-g++'
             env['CXX'] = 'x86_64-w64-mingw32-g++'
+            env['AR'] = "x86_64-w64-mingw32-ar"
+            env['RANLIB'] = "x86_64-w64-mingw32-ranlib"
+            env['LINK'] = "x86_64-w64-mingw32-g++"
         elif env['bits'] == '32':
         elif env['bits'] == '32':
             env['CXX'] = 'i686-w64-mingw32-g++'
             env['CXX'] = 'i686-w64-mingw32-g++'
+            env['AR'] = "i686-w64-mingw32-ar"
+            env['RANLIB'] = "i686-w64-mingw32-ranlib"
+            env['LINK'] = "i686-w64-mingw32-g++"
 
 
     # Native or cross-compilation using MinGW
     # Native or cross-compilation using MinGW
-    if host_platform == 'linux' or env['use_mingw']:
+    if host_platform == 'linux' or host_platform == 'osx' or env['use_mingw']:
         env.Append(CCFLAGS=['-g', '-O3', '-std=c++14', '-Wwrite-strings'])
         env.Append(CCFLAGS=['-g', '-O3', '-std=c++14', '-Wwrite-strings'])
         env.Append(LINKFLAGS=[
         env.Append(LINKFLAGS=[
             '--static',
             '--static',