Merge pull request #178 from leapmotion/fix-dllimport

Need to specify dllimport/dllexport in order to create an import lib on Windows
leapmotion · Oct 27, 2014 · 12df801 · 12df801
2 parents 33069e1 + db46449
commit 12df801
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/autowiring/AutoNetServer.h b/autowiring/AutoNetServer.h
@@ -6,6 +6,16 @@ class AutoNetServer;
 
 extern AutoNetServer* NewAutoNetServerImpl(void);
 
+#ifdef _MSC_VER
+  #ifdef AUTOWIRING_EXPORT_AUTONET
+    #define AUTONET_EXPORT __declspec(dllexport)
+  #else
+    #define AUTONET_EXPORT __declspec(dllimport)
+  #endif
+#else
+  #define AUTONET_EXPORT
+#endif
+
 class AutoNetServer:
   public CoreThread
 {
@@ -15,7 +25,7 @@ class AutoNetServer:
 public:
   virtual ~AutoNetServer();
 
-  static AutoNetServer* New(void) {
+  static AUTONET_EXPORT AutoNetServer* New(void) {
     return NewAutoNetServerImpl();
   }
 

diff --git a/src/autonet/stdafx.h b/src/autonet/stdafx.h
@@ -7,6 +7,9 @@
   #define NOMINMAX
 #endif
 
+// Defined when we are exporting symbols
+#define AUTOWIRING_EXPORT_AUTONET
+
 #ifndef _MSC_VER
   #include <stdlib.h>
 #else