diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/detect.py | 1 | ||||
| -rw-r--r-- | platform/osx/detect.py | 2 | ||||
| -rw-r--r-- | platform/windows/detect.py | 2 | ||||
| -rw-r--r-- | platform/windows/export/export.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/godot_res.rc | 2 | ||||
| -rw-r--r-- | platform/x11/detect.py | 4 |
6 files changed, 10 insertions, 3 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 9a925039a5..66097a5149 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -98,6 +98,7 @@ def configure(env): if env['android_arch']=='x86': env['NDK_TARGET']=env['NDK_TARGET_X86'] + env["x86_opt_gcc"]=True if env['PLATFORM'] == 'win32': import methods diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 22cee0527e..f7cf5111f5 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -116,4 +116,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 diff --git a/platform/windows/detect.py b/platform/windows/detect.py index fcde14030f..4ec4b054db 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -263,6 +263,7 @@ def configure(env): env.Append(CCFLAGS=["/I"+DIRECTX_PATH+"/Include"]) env.Append(LIBPATH=[DIRECTX_PATH+"/Lib/x86"]) env['ENV'] = os.environ; + env["x86_opt_vc"]=True else: # Workaround for MinGW. See: @@ -361,6 +362,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['CC'] = "winegcc" #env['CXX'] = "wineg++" diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index 29f21bf227..9cfd475091 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -327,7 +327,7 @@ EditorExportPlatformWindows::EditorExportPlatformWindows() { icon128=true; icon256=true; product_name="$genname"; - company_name="Okam Studio"; + company_name="Godot Engine"; file_description="Created With Godot Engine"; version_text="1.0"; OS::Date date = OS::get_singleton()->get_date(); diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc index 73f36e5e59..f77182f909 100644 --- a/platform/windows/godot_res.rc +++ b/platform/windows/godot_res.rc @@ -16,7 +16,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Okam Studio" + VALUE "CompanyName", "Godot Engine" VALUE "FileDescription", _MKSTR(VERSION_NAME) " Editor (" _MKSTR(VERSION_STATUS) ")" VALUE "FileVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "."_MKSTR(VERSION_REVISION) VALUE "ProductName", _MKSTR(VERSION_NAME) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 9a52a7c92b..d996587864 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -118,6 +118,8 @@ def configure(env): elif (env["target"]=="release_debug"): env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED']) + if (env["debug_release"]=="yes"): + env.Append(CCFLAGS=['-g2']) elif (env["target"]=="debug"): @@ -180,3 +182,5 @@ def configure(env): env.Append(CPPFLAGS=['-DNEW_WM_API']) env.ParseConfig('pkg-config xinerama --cflags --libs') + env["x86_opt_gcc"]=True + |