Parcourir la source

[Web/SCons] Use CCFLAGS for SIDE_MODULE option

Was using CPPFLAGS, but should use the explicit scons CCFLAGS which
makes it clear they are applied to both the C and C++ compiler.

CPPFLAGS was also fine (they are preprocessor flags, also applied to
both C and C++), but we should try to stay consistent with what we do
in Godot.

(cherry picked from commit f36acd8e312c916c7e53364e1b0bd8eec3e4410e)
Fabio Alessandrelli il y a 1 an
Parent
commit
42d9ac3b08
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      tools/web.py

+ 2 - 2
tools/web.py

@@ -39,8 +39,8 @@ def generate(env):
         env.Append(LINKFLAGS=["-s", "USE_PTHREADS=1"])
 
     # Build as side module (shared library).
-    env.Append(CPPFLAGS=["-s", "SIDE_MODULE=1"])
-    env.Append(LINKFLAGS=["-s", "SIDE_MODULE=1"])
+    env.Append(CCFLAGS=["-sSIDE_MODULE=1"])
+    env.Append(LINKFLAGS=["-sSIDE_MODULE=1"])
 
     env.Append(CPPDEFINES=["WEB_ENABLED", "UNIX_ENABLED"])