summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/android/detect.py28
-rw-r--r--platform/bb10/detect.py6
-rw-r--r--platform/haiku/detect.py2
-rw-r--r--platform/iphone/detect.py4
-rw-r--r--platform/javascript/detect.py23
-rw-r--r--platform/osx/detect.py9
-rw-r--r--platform/osx/platform_config.h2
-rw-r--r--platform/server/detect.py1
-rw-r--r--platform/windows/detect.py8
-rw-r--r--platform/windows/os_windows.cpp1
-rw-r--r--platform/windows/platform_config.h4
-rw-r--r--platform/winrt/detect.py1
-rw-r--r--platform/winrt/os_winrt.cpp1
-rw-r--r--platform/x11/detect.py49
-rw-r--r--platform/x11/platform_config.h4
15 files changed, 74 insertions, 69 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 7e482047c9..acf4ce412a 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -34,10 +34,8 @@ def get_flags():
return [
('tools', 'no'),
- ('nedmalloc', 'no'),
- ('builtin_zlib', 'no'),
- ('openssl','builtin'), #use builtin openssl
- ]
+ ('openssl', 'builtin'), #use builtin openssl
+ ]
def create(env):
@@ -98,7 +96,7 @@ def configure(env):
if env['android_arch']=='x86':
env['NDK_TARGET']=env['NDK_TARGET_X86']
- env["x86_opt_gcc"]=True
+ env["x86_libtheora_opt_gcc"]=True
if env['PLATFORM'] == 'win32':
env.Tool('gcc')
@@ -124,19 +122,20 @@ def configure(env):
gcc_path=env["ANDROID_NDK_ROOT"]+"/toolchains/"+env["NDK_TARGET"]+"/prebuilt/";
- if (sys.platform.find("linux")==0):
- if (platform.architecture()[0]=='64bit' or os.path.isdir(gcc_path+"linux-x86_64/bin")): # check was not working
+ if (sys.platform.startswith("linux")):
+ if (platform.machine().endswith('64')):
gcc_path=gcc_path+"/linux-x86_64/bin"
else:
gcc_path=gcc_path+"/linux-x86/bin"
- elif (sys.platform=="darwin"):
- gcc_path=gcc_path+"/darwin-x86_64/bin" #this may be wrong
+ elif (sys.platform.startswith("darwin")):
+ gcc_path=gcc_path+"/darwin-x86_64/bin"
env['SHLINKFLAGS'][1] = '-shared'
env['SHLIBSUFFIX'] = '.so'
- elif (os.name=="nt"):
- gcc_path=gcc_path+"/windows-x86_64/bin" #this may be wrong
-
-
+ elif (os.platform.startswith('win')):
+ if (platform.machine().endswith('64')):
+ gcc_path=gcc_path+"/windows-x86_64/bin"
+ else:
+ gcc_path=gcc_path+"/windows-x86/bin"
env['ENV']['PATH'] = gcc_path+":"+env['ENV']['PATH']
if env['android_arch']=='x86':
@@ -204,7 +203,8 @@ def configure(env):
env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL','-DMPC_FIXED_POINT'])
# env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT'])
- if(env["opus"]=="yes"):
+ # TODO: Move that to opus module's config
+ if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
if (env["android_arch"]=="armv6" or env["android_arch"]=="armv7"):
env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
env.opus_fixed_point="yes"
diff --git a/platform/bb10/detect.py b/platform/bb10/detect.py
index 9ab94e619a..2b76aa3496 100644
--- a/platform/bb10/detect.py
+++ b/platform/bb10/detect.py
@@ -32,11 +32,9 @@ def get_opts():
def get_flags():
return [
- ('lua', 'no'),
('tools', 'no'),
- ('nedmalloc', 'no'),
- ('theora', 'no'),
-
+ ('builtin_zlib', 'yes'),
+ ('module_theora_enabled', 'no'),
]
def configure(env):
diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py
index f36b0c567e..af997a5737 100644
--- a/platform/haiku/detect.py
+++ b/platform/haiku/detect.py
@@ -23,8 +23,6 @@ def get_opts():
def get_flags():
return [
- ('builtin_zlib', 'no'),
- ('glew', 'yes'),
]
def configure(env):
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 9cb52d4561..1be63891b1 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -38,6 +38,7 @@ def get_flags():
return [
('tools', 'no'),
('webp', 'yes'),
+ ('builtin_zlib', 'yes'),
('openssl','builtin'), #use builtin openssl
]
@@ -165,7 +166,8 @@ def configure(env):
env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate'
env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DMPC_FIXED_POINT'])
- if(env["opus"]=="yes"):
+ # TODO: Move that to opus module's config
+ if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
env.opus_fixed_point="yes"
if env["arch"]=="x86":
pass
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py
index aeff5a1a34..e1f91cf948 100644
--- a/platform/javascript/detect.py
+++ b/platform/javascript/detect.py
@@ -25,21 +25,11 @@ def get_opts():
def get_flags():
return [
- ('lua', 'no'),
('tools', 'no'),
- ('nedmalloc', 'no'),
- ('theora', 'no'),
- ('tools', 'no'),
- ('nedmalloc', 'no'),
- ('musepack', 'no'),
- ('squirrel', 'no'),
- ('squish', 'no'),
- ('speex', 'no'),
- ('old_scenes', 'no'),
- ('etc1', 'no'),
-# ('default_gui_theme', 'no'),
-
- #('builtin_zlib', 'no'),
+ ('builtin_zlib', 'yes'),
+ ('module_etc1_enabled', 'no'),
+ ('module_mpc_enabled', 'no'),
+ ('module_theora_enabled', 'no'),
]
@@ -80,8 +70,9 @@ def configure(env):
#env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-g4', '-DDEBUG_ENABLED'])
env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
- if(env["opus"]=="yes"):
- env.opus_fixed_point="yes"
+ # TODO: Move that to opus module's config
+ if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
+ env.opus_fixed_point = "yes"
env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti'])
env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL','-DMPC_FIXED_POINT','-DTYPED_METHOD_BIND','-DNO_THREADS'])
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 01ea09fa21..f8b2153aee 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -28,9 +28,6 @@ def get_opts():
def get_flags():
return [
- ('legacygl', 'yes'),
- ('builtin_zlib', 'no'),
- ('glew', 'yes'),
]
@@ -83,10 +80,6 @@ def configure(env):
env['AS'] = basecmd+"as"
-# env.Append(CPPPATH=['#platform/osx/include/freetype2', '#platform/osx/include'])
-# env.Append(LIBPATH=['#platform/osx/lib'])
-
-
env.Append(CPPFLAGS=["-DAPPLE_STYLE_KEYS"])
env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DOSX_ENABLED'])
env.Append(LIBS=['pthread'])
@@ -109,4 +102,4 @@ def configure(env):
env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
#env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
- env["x86_opt_gcc"]=True
+ env["x86_libtheora_opt_gcc"]=True
diff --git a/platform/osx/platform_config.h b/platform/osx/platform_config.h
index 86505206ae..f02a4bc444 100644
--- a/platform/osx/platform_config.h
+++ b/platform/osx/platform_config.h
@@ -27,5 +27,5 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include <alloca.h>
-#define GLES2_INCLUDE_H "gl_context/GL/glew.h"
+#define GLES2_INCLUDE_H "GL/glew.h"
#define PTHREAD_RENAME_SELF
diff --git a/platform/server/detect.py b/platform/server/detect.py
index e6fab2043b..2f6fb00e0d 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -27,7 +27,6 @@ def get_opts():
def get_flags():
return [
- ('builtin_zlib', 'no'),
]
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 12ea5a93ee..a5b26930be 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -176,7 +176,7 @@ def get_opts():
def get_flags():
return [
- ('glew','yes'),
+ ('builtin_zlib', 'yes'),
('openssl','builtin'), #use builtin openssl
]
@@ -279,13 +279,13 @@ def configure(env):
# Forcing bits argument because MSVC does not have a flag to set this through SCons... it's different compilers (cl.exe's) called from the propper command prompt
# that decide the architecture that is build for. Scons can only detect the os.getenviron (because vsvarsall.bat sets a lot of stuff for cl.exe to work with)
env["bits"]="32"
- env["x86_opt_vc"]=True
+ env["x86_libtheora_opt_vc"]=True
print "Detected MSVC compiler: "+compiler_version_str
# If building for 64bit architecture, disable assembly optimisations for 32 bit builds (theora as of writting)... vc compiler for 64bit can not compile _asm
if(compiler_version_str == "amd64" or compiler_version_str == "x86_amd64"):
env["bits"]="64"
- env["x86_opt_vc"]=False
+ env["x86_libtheora_opt_vc"]=False
print "Compiled program architecture will be a 64 bit executable (forcing bits=64)."
elif (compiler_version_str=="x86" or compiler_version_str == "amd64_x86"):
print "Compiled program architecture will be a 32 bit executable. (forcing bits=32)."
@@ -365,7 +365,7 @@ def configure(env):
env['AR'] = mingw_prefix+"ar"
env['RANLIB'] = mingw_prefix+"ranlib"
env['LD'] = mingw_prefix+"g++"
- env["x86_opt_gcc"]=True
+ env["x86_libtheora_opt_gcc"]=True
#env['CC'] = "winegcc"
#env['CXX'] = "wineg++"
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 35d90a8308..0ca5d3bd0f 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -29,7 +29,6 @@
#include "drivers/gles2/rasterizer_gles2.h"
#include "os_windows.h"
-#include "drivers/nedmalloc/memory_pool_static_nedmalloc.h"
#include "drivers/unix/memory_pool_static_malloc.h"
#include "os/memory_pool_dynamic_static.h"
#include "drivers/windows/thread_windows.h"
diff --git a/platform/windows/platform_config.h b/platform/windows/platform_config.h
index 9e20750816..31512a1054 100644
--- a/platform/windows/platform_config.h
+++ b/platform/windows/platform_config.h
@@ -30,6 +30,4 @@
//#else
//#include <alloca.h>
//#endif
-#define GLES2_INCLUDE_H "gl_context/GL/glew.h"
-
-
+#define GLES2_INCLUDE_H "GL/glew.h"
diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py
index 7f220736d7..79fc3651e9 100644
--- a/platform/winrt/detect.py
+++ b/platform/winrt/detect.py
@@ -29,6 +29,7 @@ def get_flags():
return [
('tools', 'no'),
+ ('builtin_zlib', 'yes'),
('openssl', 'builtin'),
]
diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp
index 0ce561f88a..4b23f3960e 100644
--- a/platform/winrt/os_winrt.cpp
+++ b/platform/winrt/os_winrt.cpp
@@ -28,7 +28,6 @@
/*************************************************************************/
#include "drivers/gles2/rasterizer_gles2.h"
#include "os_winrt.h"
-#include "drivers/nedmalloc/memory_pool_static_nedmalloc.h"
#include "drivers/unix/memory_pool_static_malloc.h"
#include "os/memory_pool_dynamic_static.h"
#include "thread_winrt.h"
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index ba232f6d4e..eb71ac7409 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -68,13 +68,10 @@ def get_opts():
def get_flags():
return [
- ('builtin_zlib', 'no'),
- ('glew', 'yes'),
- ("openssl", "yes"),
- ('freetype','yes'), #use system freetype
-
- #("theora","no"),
- ]
+ ("openssl", "system"),
+ ('freetype', 'system'),
+ ('libpng', 'system'),
+ ]
@@ -140,18 +137,50 @@ def configure(env):
env.ParseConfig('pkg-config xcursor --cflags --libs')
env.ParseConfig('pkg-config xrandr --cflags --libs')
- if (env["openssl"]=="yes"):
+ if (env["openssl"] == "system"):
env.ParseConfig('pkg-config openssl --cflags --libs')
+ if (env["libwebp"] == "system"):
+ env.ParseConfig('pkg-config libwebp --cflags --libs')
- if (env["freetype"]=="yes"):
+ if (env["freetype"] == "system"):
+ env["libpng"] = "system" # Freetype links against libpng
env.ParseConfig('pkg-config freetype2 --cflags --libs')
+ if (env["libpng"] == "system"):
+ env.ParseConfig('pkg-config libpng --cflags --libs')
+
+ if (env["enet"] == "system"):
+ env.ParseConfig('pkg-config libenet --cflags --libs')
+
+ if (env["squish"] == "system" and env["tools"] == "yes"):
+ env.ParseConfig('pkg-config libsquish --cflags --libs')
+
+ # Sound and video libraries
+ # Keep the order as it triggers chained dependencies (ogg needed by others, etc.)
+ if (env["libtheora"] == "system"):
+ env["libogg"] = "system" # Needed to link against system libtheora
+ env["libvorbis"] = "system" # Needed to link against system libtheora
+ env.ParseConfig('pkg-config theora theoradec --cflags --libs')
+
+ if (env["libvorbis"] == "system"):
+ env["libogg"] = "system" # Needed to link against system libvorbis
+ env.ParseConfig('pkg-config vorbis vorbisfile --cflags --libs')
+
+ if (env["opus"] == "system"):
+ env["libogg"] = "system" # Needed to link against system opus
+ env.ParseConfig('pkg-config opus opusfile --cflags --libs')
+
+ if (env["libogg"] == "system"):
+ env.ParseConfig('pkg-config ogg --cflags --libs')
env.Append(CPPFLAGS=['-DOPENGL_ENABLED'])
+ if (env["glew"] == "system"):
+ env.ParseConfig('pkg-config glew --cflags --libs')
+
if os.system("pkg-config --exists alsa")==0:
print("Enabling ALSA")
env.Append(CPPFLAGS=["-DALSA_ENABLED"])
@@ -208,5 +237,5 @@ def configure(env):
list_of_x86 = ['x86_64', 'x86', 'i386', 'i586']
if any(platform.machine() in s for s in list_of_x86):
- env["x86_opt_gcc"]=True
+ env["x86_libtheora_opt_gcc"]=True
diff --git a/platform/x11/platform_config.h b/platform/x11/platform_config.h
index 3b47b2c92d..015953157d 100644
--- a/platform/x11/platform_config.h
+++ b/platform/x11/platform_config.h
@@ -34,6 +34,4 @@
#define PTHREAD_BSD_SET_NAME
#endif
-#define GLES2_INCLUDE_H "gl_context/GL/glew.h"
-
-
+#define GLES2_INCLUDE_H "GL/glew.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-28 15:02:50 +0000