Bladeren bron

Mingw32 amalgamation (#747)

* Fix amalgamation script for Windows

* adding mingw32 build with amalgamate option
Sten Grüner 8 jaren geleden
bovenliggende
commit
e824061755
2 gewijzigde bestanden met toevoegingen van 9 en 2 verwijderingen
  1. 7 0
      appveyor.yml
  2. 2 2
      tools/amalgamate.py

+ 7 - 0
appveyor.yml

@@ -62,6 +62,13 @@ build_script:
   - rd /s /q build
   - md build
   - cd build
+  - echo "Testing MinGW32 with amalgamation"
+  - cmake -DUA_BUILD_EXAMPLES:BOOL=ON -DUA_BUILD_SELFSIGNED_CERTIFICATE:BOOL=ON -DUA_ENABLE_AMALGAMATION:BOOL=ON -G"MinGW Makefiles" ..
+  - mingw32-make
+  - cd ..
+  - rd /s /q build
+  - md build
+  - cd build
   - cmake -DUA_BUILD_EXAMPLES:BOOL=ON -G"Visual Studio 12 2013" ..
   - msbuild open62541.sln /m
   - echo "Testing amalgamation"

+ 2 - 2
tools/amalgamate.py

@@ -44,8 +44,8 @@ file.write(u"""/* THIS IS A SINGLE-FILE DISTRIBUTION CONCATENATED FROM THE OPEN6
  */\n\n""" % args.version)
 
 if is_c:
-    file.write(u'''#ifndef UA_DYNAMIC_LINKING
-# define UA_DYNAMIC_LINKING
+    file.write(u'''#ifndef UA_DYNAMIC_LINKING_EXPORT
+# define UA_DYNAMIC_LINKING_EXPORT
 #endif
 
 #include "%s.h"