Static link fix

2016-09-02 14:48:36 -07:00
parent 1b34b83d80
commit 8915f9142a
3 changed files with 6 additions and 2 deletions
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -238,7 +238,7 @@
 		<file name="src/ui/WindowEvent.cpp" />
 		<file name="src/utils/Bytes.cpp" />
 		
-		<file name="src/hx/CFFIExt.cpp" unless="static_link" />
+		<file name="src/hx/CFFIExt.cpp" />
 		
 	</files>
 	
--- a/project/include/hx/CFFIExt.h
+++ b/project/include/hx/CFFIExt.h
@@ -3,7 +3,11 @@

 #include <hx/CFFI.h>

+#ifdef STATIC_LINK
+void *LoadFunc(const char *inName) { return 0; }
+#else
 extern void *LoadFunc(const char *inName);
+#endif

 #ifdef IMPLEMENT_CFFI_EXT
 #define DEFFUNC_EXT(name,ret,def_args,call_args) \
--- a/project/src/hx/CFFIExt.cpp
+++ b/project/src/hx/CFFIExt.cpp
@@ -1,3 +1,3 @@
 #define IMPLEMENT_CFFI_EXT

-#include <hx/CFFIExt.h>
+#include <hx/CFFIExt.h>