4 files changed, 6 insertions, 6 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 8d56dbcda..f778e9a09 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -96,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')
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 8d8e88252..f8b2153ae 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -102,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/windows/detect.py b/platform/windows/detect.py
index af9a0aca4..a5b26930b 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -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/x11/detect.py b/platform/x11/detect.py
index 92bc58d7b..eb71ac740 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -237,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