Fixes

-=-=-=

-Added missing quaternion constructor
-code completion fixes
-winrt fixes

1 files changed, 81 insertions, 21 deletions

diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py
index dd9d1877ec..d97d974a19 100644
--- a/platform/winrt/detect.py
+++ b/platform/winrt/detect.py
@@ -30,38 +30,99 @@ def get_flags():
 def configure(env):

 

 	env.Append(CPPPATH=['#platform/winrt', '#platform/winrt/include'])

+	arch = ""

 

-	env.Append(LINKFLAGS=['/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', "kernel32.lib", '/MACHINE:X64', '/WINMD', '/APPCONTAINER', '/MANIFESTUAC:NO', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1'])

+	if os.getenv('PLATFORM') == "ARM":

 

-	env.Append(LIBPATH=['#platform/winrt/x64/lib'])

+		# compiler commandline

+		# debug:   /Yu"pch.h" /MP /GS     /analyze- /W3 /wd"4453" /wd"28204"     /Zc:wchar_t /I"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\App2\App2.WindowsPhone\" /I"Generated Files\" /I"ARM\Debug\"   /I"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\App2\App2.Shared\" /ZW:nostdlib /Zi /Gm- /Od /sdl /Fd"ARM\Debug\vc120.pdb"   /fp:precise /D "PSAPI_VERSION=2" /D "WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP" /D "_UITHREADCTXT_SUPPORT=0" /D "_UNICODE" /D "UNICODE" /D "_DEBUG" /errorReport:prompt /WX- /Zc:forScope /RTC1 /ZW /Gd /Oy- /MDd    /Fa"ARM\Debug\"   /EHsc /nologo /Fo"ARM\Debug\"   /Fp"ARM\Debug\App2.WindowsPhone.pch"

+		# release: /Yu"pch.h" /MP /GS /GL /analyze- /W3 /wd"4453" /wd"28204" /Gy /Zc:wchar_t /I"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\App2\App2.WindowsPhone\" /I"Generated Files\" /I"ARM\Release\" /I"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\App2\App2.Shared\" /ZW:nostdlib /Zi /Gm- /O2 /sdl /Fd"ARM\Release\vc120.pdb" /fp:precise /D "PSAPI_VERSION=2" /D "WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP" /D "_UITHREADCTXT_SUPPORT=0" /D "_UNICODE" /D "UNICODE"             /errorReport:prompt /WX- /Zc:forScope       /ZW /Gd /Oy- /Oi /MD /Fa"ARM\Release\" /EHsc /nologo /Fo"ARM\Release\" /Fp"ARM\Release\App2.WindowsPhone.pch"

 

+		# linker commandline

+		# debug:   /OUT:"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\ARM\Debug\App2.WindowsPhone\App2.WindowsPhone.exe"   /MANIFEST:NO       /NXCOMPAT /PDB:"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\ARM\Debug\App2.WindowsPhone\App2.WindowsPhone.pdb"   /DYNAMICBASE "WindowsPhoneCore.lib" "RuntimeObject.lib" "PhoneAppModelHost.lib" /DEBUG /MACHINE:ARM /NODEFAULTLIB:"kernel32.lib" /NODEFAULTLIB:"ole32.lib" /WINMD /APPCONTAINER /INCREMENTAL /PGD:"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\ARM\Debug\App2.WindowsPhone\App2.WindowsPhone.pgd"   /WINMDFILE:"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\ARM\Debug\App2.WindowsPhone\App2.winmd"   /SUBSYSTEM:WINDOWS /MANIFESTUAC:NO /ManifestFile:"ARM\Debug\App2.WindowsPhone.exe.intermediate.manifest"            /ERRORREPORT:PROMPT /NOLOGO /TLBID:1

+		# release: /OUT:"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\ARM\Release\App2.WindowsPhone\App2.WindowsPhone.exe" /MANIFEST:NO /LTCG /NXCOMPAT /PDB:"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\ARM\Release\App2.WindowsPhone\App2.WindowsPhone.pdb" /DYNAMICBASE "WindowsPhoneCore.lib" "RuntimeObject.lib" "PhoneAppModelHost.lib" /DEBUG /MACHINE:ARM /NODEFAULTLIB:"kernel32.lib" /NODEFAULTLIB:"ole32.lib" /WINMD /APPCONTAINER /OPT:REF     /PGD:"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\ARM\Release\App2.WindowsPhone\App2.WindowsPhone.pgd" /WINMDFILE:"C:\Users\ariel\Documents\Visual Studio 2013\Projects\App2\ARM\Release\App2.WindowsPhone\App2.winmd" /SUBSYSTEM:WINDOWS /MANIFESTUAC:NO /ManifestFile:"ARM\Release\App2.WindowsPhone.exe.intermediate.manifest" /OPT:ICF /ERRORREPORT:PROMPT /NOLOGO /TLBID:1

 

-	if (env["target"]=="release"):

+		arch = "arm"

 

-		env.Append(CCFLAGS=['/O2'])

-		env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])

-		env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])

+		env.Append(LINKFLAGS=['/INCREMENTAL:NO', '/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', "WindowsPhoneCore.lib", "RuntimeObject.lib", "PhoneAppModelHost.lib", "/DEBUG", "/MACHINE:ARM", '/NODEFAULTLIB:"kernel32.lib"', '/NODEFAULTLIB:"ole32.lib"', '/WINMD', '/APPCONTAINER', '/MANIFESTUAC:NO', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1'])

+		env.Append(LIBPATH=['#platform/winrt/ARM/lib'])

 

-	elif (env["target"]=="test"):

+		env.Append(CCFLAGS=string.split('/MP /GS /wd"4453" /wd"28204" /analyze- /Zc:wchar_t /Zi /Gm- /Od /fp:precise /fp:precise /D "PSAPI_VERSION=2" /D "WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP" /DWINDOWSPHONE_ENABLED /D "_UITHREADCTXT_SUPPORT=0" /D "_UNICODE" /D "UNICODE" /errorReport:prompt /WX- /Zc:forScope /Gd /Oy- /Oi /MD /RTC1 /Gd /EHsc /nologo'))

+		env.Append(CXXFLAGS=string.split('/ZW'))

 

-		env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO'])

-		env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])

+		if (env["target"]=="release"):

 

-	elif (env["target"]=="debug"):

+			env.Append(CCFLAGS=['/O2'])

+			env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])

 

-		env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO'])

-		env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])

-		env.Append(LINKFLAGS=['/DEBUG', '/D_DEBUG'])

+		elif (env["target"]=="test"):

 

-	elif (env["target"]=="profile"):

+			env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO'])

+			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])

 

-		env.Append(CCFLAGS=['-g','-pg'])

-		env.Append(LINKFLAGS=['-pg'])

+		elif (env["target"]=="debug"):

 

+			env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO'])

+			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])

+			env.Append(LINKFLAGS=['/DEBUG', '/D_DEBUG'])

+

+		elif (env["target"]=="profile"):

+

+			env.Append(CCFLAGS=['-g','-pg'])

+			env.Append(LINKFLAGS=['-pg'])

+

+

+		env['ENV'] = os.environ;

+		# fix environment for windows phone 8.1

+		env['ENV']['WINDOWSPHONEKITDIR'] = env['ENV']['WINDOWSPHONEKITDIR'].replace("8.0", "8.1") # wtf

+		env['ENV']['INCLUDE'] = env['ENV']['INCLUDE'].replace("8.0", "8.1")

+		env['ENV']['LIB'] = env['ENV']['LIB'].replace("8.0", "8.1")

+		env['ENV']['PATH'] = env['ENV']['PATH'].replace("8.0", "8.1")

+		env['ENV']['LIBPATH'] = env['ENV']['LIBPATH'].replace("8.0\\Windows Metadata", "8.1\\References\\CommonConfiguration\\Neutral")

+

+	else:

+

+		arch = "x64"

+		env.Append(LINKFLAGS=['/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', "kernel32.lib", '/MACHINE:X64', '/WINMD', '/APPCONTAINER', '/MANIFESTUAC:NO', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1'])

+

+		env.Append(LIBPATH=['#platform/winrt/x64/lib'])

+

+

+		if (env["target"]=="release"):

+

+			env.Append(CCFLAGS=['/O2'])

+			env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])

+			env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])

+

+		elif (env["target"]=="test"):

+

+			env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO'])

+			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])

+

+		elif (env["target"]=="debug"):

+

+			env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DD3D_DEBUG_INFO'])

+			env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])

+			env.Append(LINKFLAGS=['/DEBUG', '/D_DEBUG'])

+

+		elif (env["target"]=="profile"):

+

+			env.Append(CCFLAGS=['-g','-pg'])

+			env.Append(LINKFLAGS=['-pg'])

+

+

+		env.Append(CCFLAGS=string.split('/MP /GS /wd"4453" /wd"28204" /Zc:wchar_t /Gm- /Od /fp:precise /D "_UNICODE" /D "UNICODE" /D "WINAPI_FAMILY=WINAPI_FAMILY_APP" /errorReport:prompt /WX- /Zc:forScope /RTC1 /Gd /MDd /EHsc /nologo'))

+		env.Append(CXXFLAGS=string.split('/ZW'))

+		env.Append(CCFLAGS=['/AI', os.environ['VCINSTALLDIR']+'\\vcpackages', '/AI', os.environ['WINDOWSSDKDIR']+'\\References\\CommonConfiguration\\Neutral'])

+		env.Append(CCFLAGS=['/DWINAPI_FAMILY=WINAPI_FAMILY_APP', '/D_WIN32_WINNT=0x0603', '/DNTDDI_VERSION=0x06030000'])

+

+		env['ENV'] = os.environ;

+

+

+	env["PROGSUFFIX"]="."+arch+env["PROGSUFFIX"]

+	env["OBJSUFFIX"]="."+arch+env["OBJSUFFIX"]

+	env["LIBSUFFIX"]="."+arch+env["LIBSUFFIX"]

 

-	env.Append(CCFLAGS=string.split('/MP /GS /wd"4453" /wd"28204" /Zc:wchar_t /Gm- /Od /fp:precise /D "_UNICODE" /D "UNICODE" /D "WINAPI_FAMILY=WINAPI_FAMILY_APP" /errorReport:prompt /WX- /Zc:forScope /RTC1 /Gd /MDd /EHsc /nologo'))

-	env.Append(CXXFLAGS=string.split('/ZW'))

-	env.Append(CCFLAGS=['/AI', os.environ['VCINSTALLDIR']+'\\vcpackages', '/AI', os.environ['WINDOWSSDKDIR']+'\\References\\CommonConfiguration\\Neutral'])

 

 	#env.Append(CCFLAGS=['/Gd','/GR','/nologo', '/EHsc'])

 	#env.Append(CXXFLAGS=['/TP', '/ZW'])

@@ -69,7 +130,6 @@ def configure(env):
 	##env.Append(CCFLAGS=['/I'+os.getenv("WindowsSdkDir")+"/Include"])

 	env.Append(CCFLAGS=['/DWINRT_ENABLED'])

 	env.Append(CCFLAGS=['/DWINDOWS_ENABLED'])

-	env.Append(CCFLAGS=['/DWINAPI_FAMILY=WINAPI_FAMILY_APP', '/D_WIN32_WINNT=0x0603', '/DNTDDI_VERSION=0x06030000'])

 	env.Append(CCFLAGS=['/DRTAUDIO_ENABLED'])

 	#env.Append(CCFLAGS=['/DWIN32'])

 	env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])

@@ -92,5 +152,5 @@ def configure(env):
 	env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )

 	env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )

 

-	env['ENV'] = os.environ;

 

+#/c/Program Files (x86)/Windows Phone Kits/8.1/lib/ARM/WindowsPhoneCore.lib