Allow cffi symbols to be hidden when static-linking. Add HXCPP_NO_IMPLIB to avoid generation of .lib and .exp files on windows. Correct typo in 'fillouput'.

Author: hughsando

include/hx/CFFIPrime.h

@@ -997,7 +997,10 @@ const char16_t * hxs_utf16(const String &string,hx::IStringAlloc *alloc)
 }
 
 
-EXPORT void * hx_cffi(const char *inName)
+#ifndef HXCPP_STATIC_CFFI
+EXPORT
+#endif
+void * hx_cffi(const char *inName)
 {
    #define HXCPP_PRIME
    #define DEFFUNC(name,r,b,c) if ( !strcmp(inName,#name) ) return (void *)name;

src/hx/CFFI.cpp

@@ -2,6 +2,7 @@
  <flag value="-DHXCPP_DEBUG" if="debug" />
  <flag value="-DSTATIC_LINK" if="static_link" tag="static" />
  <flag value="-DHXCPP_EXE_LINK" if="exe_link" tag="static" />
+ <flag value="-DHXCPP_STATIC_CFFI" if="HXCPP_STATIC_CFFI" tag="cffi" />
  <flag value="-DHXCPP_ARM64" if="HXCPP_ARM64"/>
  <flag value="-DHXCPP_ARMV7" if="HXCPP_ARMV7"/>
  <flag value="-DHXCPP_M64" if="HXCPP_M64||HXCPP_ARM64||HXCPP_X86_64"/>

toolchain/common-defines.xml

@@ -1,7 +1,7 @@
 <xml>
 
 <!-- make sure hxcpp.n is up to date -->
-<pleaseUpdateHxcppTool version="6" />
+<pleaseUpdateHxcppTool version="7" />
 
 <pragma once="true" />
 
@@ -158,7 +158,7 @@
 
   <file name = "src/hx/Anon.cpp"/>
   <file name = "src/hx/Boot.cpp"/>
-  <file name = "src/hx/CFFI.cpp" tags="haxe,static" />
+  <file name = "src/hx/CFFI.cpp" tags="haxe,static,cffi" />
   <file name = "src/hx/Date.cpp"/>
   <file name = "src/hx/gc/GcCommon.cpp" tags="haxe,gc" />
   <file name = "src/hx/gc/Immix.cpp" tags="haxe,gc" />
@@ -239,7 +239,8 @@
      <ext value="${LIBEXTRA}" if="exe_link" />
   </section>
 
-  <fullouput name="${HAXE_FULL_OUTPUT_NAME}" if="HAXE_FULL_OUTPUT_NAME" />
+  <!-- Note: was - 'fullouput' -->
+  <fulloutput name="${HAXE_FULL_OUTPUT_NAME}" if="HAXE_FULL_OUTPUT_NAME" />
   <fullunstripped name="${HAXE_FULL_UNSTRIPPED_NAME}" if="HAXE_FULL_UNSTRIPPED_NAME" />
 
   <files id="__main__" unless="static_link" />

toolchain/haxe-target.xml

@@ -130,6 +130,8 @@
   <flag value="-LTCG" if="HXCPP_OPTIMIZE_LINK" unless="debug || HXCPP_LTCG_INCREMENTAL"/>
   <flag value="-LTCG:INCREMENTAL" if="HXCPP_LTCG_INCREMENTAL" unless="debug"/>
   <flag value="-map:${HXCPP_MAP_FILE}" if="HXCPP_MAP_FILE" />
+  <flag value="-NOIMPLIB" if="HXCPP_NO_IMPLIB" />
+  <flag value="-NOEXP" if="HXCPP_NO_IMPLIB" />
   <lib name="${dll_import_link}" if="dll_import_link" />
   <ext value=".dll"/>
   <libdir name="obj/lib"/>
@@ -154,6 +156,8 @@
   <flag value="-LTCG:INCREMENTAL" if="HXCPP_LTCG_INCREMENTAL" unless="debug"/>
   <flag value="-subsystem:windows${SUBSYSTEM_VER}" if="SUBSYSTEMWINDOWS" />
   <flag value="-subsystem:console${SUBSYSTEM_VER}" if="SUBSYSTEMCONSOLE" />
+  <flag value="-NOIMPLIB" if="HXCPP_NO_IMPLIB" />
+  <flag value="-NOEXP" if="HXCPP_NO_IMPLIB" />
   <libpathflag value="-libpath:"/>
   <flag value="-libpath:lib"/>
   <flag value="user32.lib"/>

toolchain/msvc-toolchain.xml

@@ -772,7 +772,7 @@ class BuildTool
             }
             Profile.pop();
          case _ if (inDestination != null):
-            Log.warn('Target \'${inTarget}\' does not output a file, so \'destination\' has been ignored');
+            Log.v('Target \'${inTarget}\' does not output a file, so \'destination\' has been ignored');
       }
 
       if (mCopyFiles.length>0)
@@ -1263,7 +1263,7 @@ class BuildTool
                case "ext" : target.setExt( (substitute(el.att.value)) );
                case "builddir" : target.mBuildDir = substitute(el.att.name);
                case "libpath" : target.mLibPaths.push( substitute(el.att.name) );
-               case "fullouput" : target.mFullOutputName = substitute(el.att.name);
+               case "fulloutput" : target.mFullOutputName = substitute(el.att.name);
                case "fullunstripped" : target.mFullUnstrippedName = substitute(el.att.name);
                case "files" :
                   var id = el.att.id;
@@ -2361,7 +2361,7 @@ class BuildTool
    public function checkToolVersion(inVersion:String)
    {
       var ver = Std.parseInt(inVersion);
-      if (ver>6)
+      if (ver>7)
          Log.error("Your version of hxcpp.n is out-of-date.  Please update by compiling 'haxe compile.hxml' in hxcpp/tools/hxcpp.");
    }