Fix Windows build

ashtonmeuser · Apr 5, 2023 · d0ff431 · d0ff431
1 parent f8a84cf
commit d0ff431
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/SConstruct b/SConstruct
@@ -75,6 +75,7 @@ elif env['platform'] == 'linux':
 elif env['platform'] == 'windows':
     env['LIBPREFIX'] = ''
     env['LIBSUFFIX'] = '.lib'
+    env['LIBWASMERSUFFIX'] = '.dll.lib' # Requires special suffix
     env.Append(ENV=os.environ) # Keep session env variables to support VS 2017 prompt
     env.Append(CPPDEFINES=['WIN32', '_WIN32', '_WINDOWS', '_CRT_SECURE_NO_WARNINGS'])
     env.Append(CCFLAGS=['-W3', '-GR'])
@@ -90,7 +91,7 @@ elif env['platform'] == 'windows':
 
 # Explicit static libraries
 cpp_library = File('godot-cpp/bin/libgodot-cpp.{}.{}.64{}'.format(env['platform'], env['target'], env['LIBSUFFIX']))
-wasmer_library = File('wasmer/lib/{}wasmer{}'.format(env['LIBPREFIX'], env['LIBSUFFIX']))
+wasmer_library = File('wasmer/lib/{}wasmer{}'.format(env['LIBPREFIX'], env.get('LIBWASMERSUFFIX', env['LIBSUFFIX'])))
 
 # CPP includes and libraries
 env.Append(CPPPATH=['.', 'godot-cpp/godot-headers', 'godot-cpp/include', 'wasmer/include', 'godot-cpp/include/core', 'godot-cpp/include/gen'])

diff --git a/godot-wasm.cpp b/godot-wasm.cpp
@@ -1,9 +1,14 @@
 #include "godot-wasm.h"
 
 namespace {
+  #ifdef __GNUC__
+    #define UNLIKELY(cond) __builtin_expect(!!(cond), 0)
+  #else
+    #define UNLIKELY(cond) cond
+  #endif
   #define PRINT_ERROR(message) godot::Godot::print_error("Godot Wasm: " + godot::String(message), __func__, __FILE__, __LINE__);
   #define FAIL(message, ret) do { PRINT_ERROR(message); return ret; } while (0)
-  #define FAIL_IF(cond, message, ret) do { if (__builtin_expect(!!(cond), 0)) FAIL(message, ret); } while (0)
+  #define FAIL_IF(cond, message, ret) do { if (UNLIKELY(cond)) FAIL(message, ret); } while (0)
   #define NULL_VARIANT godot::Variant()
 
   godot::Variant extract_variant(wasm_val_t value) {