diff --git a/modules/mesh_utils/SCsub b/modules/mesh_utils/SCsub index c1eb6dc325..20083ceb52 100644 --- a/modules/mesh_utils/SCsub +++ b/modules/mesh_utils/SCsub @@ -13,8 +13,7 @@ sources = [ "xatlas/xatlas.cpp", ] -if version.major < 4: - sources.append("delaunay/r128.c") +sources.append("delaunay/r128.c") if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes': # Shared lib compilation diff --git a/modules/props/SCsub b/modules/props/SCsub index 55f169d8d7..6ea2fea197 100644 --- a/modules/props/SCsub +++ b/modules/props/SCsub @@ -47,8 +47,7 @@ sources = [ "material_cache/prop_material_cache.cpp" ] -if version.minor >= 4: - sources.append("props/prop_data_portal.cpp") +sources.append("props/prop_data_portal.cpp") if env["module_texture_packer_enabled"]: sources.append("material_cache/prop_material_cache_pcm.cpp") diff --git a/modules/props_2d/SCsub b/modules/props_2d/SCsub index de7971dc7b..8208b60c50 100644 --- a/modules/props_2d/SCsub +++ b/modules/props_2d/SCsub @@ -46,8 +46,7 @@ sources = [ "material_cache/prop_2d_material_cache.cpp" ] -if version.minor >= 4: - sources.append("props/prop_2d_data_portal.cpp") +sources.append("props/prop_2d_data_portal.cpp") if env["module_texture_packer_enabled"]: sources.append("material_cache/prop_2d_material_cache_pcm.cpp") diff --git a/platform/frt/detect.py b/platform/frt/detect.py index 2403ab4fd3..45e249c545 100644 --- a/platform/frt/detect.py +++ b/platform/frt/detect.py @@ -5,21 +5,12 @@ import version -if version.major > 2: - yes = True - no = False -else: - yes = 'yes' - no = 'no' +yes = True +no = False def has_wrapper_for(lib): - - if version.major == 2: - return False - if version.minor > 2: - return True - return False + return True def is_active(): @@ -40,11 +31,7 @@ def can_build(): def get_opts(): - - if version.major > 2: - from SCons.Variables import BoolVariable - else: - def BoolVariable(a,b,c): return (a,b,c) + from SCons.Variables import BoolVariable return [ ('frt_arch', 'Architecture (no/arm32v6/arm32v7/arm64v8)', 'no'), @@ -66,10 +53,8 @@ def check(env, key): if not (key in env): return False - if version.major > 2: - return env[key] - else: - return env[key] == 'yes' + + return env[key] def configure(env): @@ -133,9 +118,8 @@ def configure(env): if os.system(pkg_config + ' --exists libpulse') == 0: print('Enabling PulseAudio') env.Append(CPPDEFINES=['PULSEAUDIO_ENABLED']) - if version.major == 2: - env.ParseConfig(pkg_config + ' --cflags --libs libpulse-simple') - elif has_wrapper_for('libpulse'): + + if has_wrapper_for('libpulse'): env.ParseConfig(pkg_config + ' --cflags libpulse') else: env.ParseConfig(pkg_config + ' --cflags --libs libpulse') @@ -162,9 +146,10 @@ def configure(env): env.Append(CCFLAGS=['-O3', '-DDEBUG_ENABLED']) elif env['target'] == 'debug': env.Append(CCFLAGS=['-g2', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED']) - if env['target'].startswith('release'): - if version.major == 2 or (version.major == 3 and version.minor == 0): - env.Append(CCFLAGS=['-ffast-math']) + + #if env['target'].startswith('release'): + # if version.major == 2 or (version.major == 3 and version.minor == 0): + # env.Append(CCFLAGS=['-ffast-math']) if env['frt_arch'] == 'arm32v6': env.Append(CCFLAGS=['-march=armv6', '-mfpu=vfp', '-mfloat-abi=hard']) @@ -179,7 +164,8 @@ def configure(env): #env.Append(CFLAGS=['-std=gnu11']) # for libwebp (maybe more in the future) env.Append(CPPFLAGS=['-DFRT_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_ENABLED']) env.Append(LIBS=['pthread']) - if env['frt_arch'] == 'arm32v6' and version.major == 3 and version.minor >= 4: # TODO find out exact combination + + if env['frt_arch'] == 'arm32v6': env.Append(LIBS=['atomic']) env.Append(FRT_MODULES=['envprobe.cpp']) diff --git a/platform/frt_sdl/detect.py b/platform/frt_sdl/detect.py index 4b6619a148..4b4d1d37c8 100644 --- a/platform/frt_sdl/detect.py +++ b/platform/frt_sdl/detect.py @@ -91,8 +91,10 @@ def configure_misc(env): env.Append(CPPFLAGS=['-DFRT_ENABLED']) #env.Append(CFLAGS=['-std=gnu11']) # for libwebp (maybe more in the future) env.Append(LIBS=['pthread', 'z', 'dl']) - if env['frt_arch'] == 'arm32v6' and version.minor >= 4: # TODO find out exact combination + + if env['frt_arch'] == 'arm32v6': env.Append(LIBS=['atomic']) + if env['CXX'] == 'clang++': env['CC'] = 'clang' env['LD'] = 'clang++'