|
|
@@ -145,7 +145,7 @@ opts = Variables(customs, ARGUMENTS)
|
|
|
|
|
|
# Target build options
|
|
|
opts.Add('arch', "Platform-dependent architecture (arm/arm64/x86/x64/mips/etc)", '')
|
|
|
-opts.Add(EnumVariable('bits', "Target platform bits", 'default', ('default', '32', '64', 'fat')))
|
|
|
+opts.Add(EnumVariable('bits', "Target platform bits", 'default', ('default', '32', '64')))
|
|
|
opts.Add('p', "Platform (alias for 'platform')", '')
|
|
|
opts.Add('platform', "Target platform (%s)" % ('|'.join(platform_list), ), '')
|
|
|
opts.Add(EnumVariable('target', "Compilation target", 'debug', ('debug', 'release_debug', 'release')))
|
|
|
@@ -161,11 +161,11 @@ opts.Add(BoolVariable('xml', "XML format support for resources", True))
|
|
|
|
|
|
# Advanced options
|
|
|
opts.Add(BoolVariable('disable_3d', "Disable 3D nodes for smaller executable", False))
|
|
|
-opts.Add(BoolVariable('disable_advanced_gui', "Disable advance 3D gui nodes and behaviors", False))
|
|
|
+opts.Add(BoolVariable('disable_advanced_gui', "Disable advanced 3D gui nodes and behaviors", False))
|
|
|
opts.Add('extra_suffix', "Custom extra suffix added to the base filename of all generated binary files", '')
|
|
|
opts.Add('unix_global_settings_path', "UNIX-specific path to system-wide settings. Currently only used for templates", '')
|
|
|
opts.Add(BoolVariable('verbose', "Enable verbose output for the compilation", False))
|
|
|
-opts.Add(BoolVariable('vsproj', "Generate Visual Studio Project.", False))
|
|
|
+opts.Add(BoolVariable('vsproj', "Generate Visual Studio Project", False))
|
|
|
opts.Add(EnumVariable('warnings', "Set the level of warnings emitted during compilation", 'no', ('extra', 'all', 'moderate', 'no')))
|
|
|
opts.Add(BoolVariable('progress', "Show a progress indicator during build", True))
|
|
|
opts.Add(BoolVariable('dev', "If yes, alias for verbose=yes warnings=all", False))
|
|
|
@@ -353,7 +353,7 @@ if selected_platform in platform_list:
|
|
|
env.Append(CCFLAGS=['-Wall', '-Wno-unused'])
|
|
|
else: # 'no'
|
|
|
env.Append(CCFLAGS=['-w'])
|
|
|
-
|
|
|
+ env.Append(CCFLAGS=['-Werror=return-type'])
|
|
|
#env['platform_libsuffix'] = env['LIBSUFFIX']
|
|
|
|
|
|
suffix = "." + selected_platform
|
|
|
@@ -382,8 +382,6 @@ if selected_platform in platform_list:
|
|
|
suffix += ".32"
|
|
|
elif (env["bits"] == "64"):
|
|
|
suffix += ".64"
|
|
|
- elif (env["bits"] == "fat"):
|
|
|
- suffix += ".fat"
|
|
|
|
|
|
suffix += env.extra_suffix
|
|
|
|
Rémi Verschelde