From aa82ced9b6e223b3b722a7391b7a213fbf3b1090 Mon Sep 17 00:00:00 2001 From: Michael Fabain Dirks Date: Fri, 3 Jun 2016 00:01:06 +0200 Subject: [PATCH] Last commit, this project has been filed under abandoned. --- BlitzBasicIDE/blitzide.vcxproj | 28 ++++++++-------- BlitzBasicLauncher/bblaunch.vcxproj | 28 ++++++++-------- BlitzNext.sln | 5 ++- Engine/Engine.vcxproj | 50 +++++++++++++++++++++++++---- Linker/linker_dll.vcxproj | 28 ++++++++-------- LinkerLib/linker.vcxproj | 28 ++++++++-------- Runtime/bbruntime_dll.vcxproj | 28 ++++++++-------- RuntimeLib/bbruntime.vcxproj | 28 ++++++++-------- asm_makeinsts/asm_makeinsts.vcxproj | 28 ++++++++-------- blitz/blitz.vcxproj | 28 ++++++++-------- blitz/main.cpp | 24 +++++++------- blitz3d/blitz3d.vcxproj | 28 ++++++++-------- compiler/compiler.vcxproj | 28 ++++++++-------- config/config.vcxproj | 28 ++++++++-------- debugger/debugger.vcxproj | 28 ++++++++-------- gxruntime/gxruntime.vcxproj | 28 ++++++++-------- stdutil/stdutil.vcxproj | 28 ++++++++-------- 17 files changed, 255 insertions(+), 216 deletions(-) diff --git a/BlitzBasicIDE/blitzide.vcxproj b/BlitzBasicIDE/blitzide.vcxproj index 8fa610b..ff90dba 100644 --- a/BlitzBasicIDE/blitzide.vcxproj +++ b/BlitzBasicIDE/blitzide.vcxproj @@ -44,15 +44,15 @@ - ..\#Test\bin - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Test\bin - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -61,7 +61,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -69,18 +69,18 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 true Speed - true - true + false + false false - StdCall + Cdecl true @@ -110,16 +110,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -129,7 +129,7 @@ false false false - StdCall + Cdecl true diff --git a/BlitzBasicLauncher/bblaunch.vcxproj b/BlitzBasicLauncher/bblaunch.vcxproj index 54066cf..4c225fa 100644 --- a/BlitzBasicLauncher/bblaunch.vcxproj +++ b/BlitzBasicLauncher/bblaunch.vcxproj @@ -43,15 +43,15 @@ - ..\#Test - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Test - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -60,7 +60,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -68,18 +68,18 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 true Speed - true - true + false + false false - StdCall + Cdecl true @@ -107,16 +107,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -126,7 +126,7 @@ false false false - StdCall + Cdecl true diff --git a/BlitzNext.sln b/BlitzNext.sln index 53f9de1..48268b6 100644 --- a/BlitzNext.sln +++ b/BlitzNext.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asm_makeinsts", "asm_makeinsts\asm_makeinsts.vcxproj", "{E85F5BD3-FEA3-4342-885E-2C00AFBFE12E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blitz", "blitz\blitz.vcxproj", "{C23AF61E-9509-411F-933E-17DB18884B21}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlitzCC", "blitz\blitz.vcxproj", "{C23AF61E-9509-411F-933E-17DB18884B21}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blitz3d", "blitz3d\blitz3d.vcxproj", "{BE0BA538-6215-4836-9227-1D3627E40D61}" EndProject @@ -19,7 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GraphicsRuntime", "gxruntim EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdutil", "stdutil\stdutil.vcxproj", "{6BCFC5CA-EA71-4AE9-8B96-28B8701F939E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlitzBasicIDE", "BlitzBasicIDE\blitzide.vcxproj", "{B61D8348-B715-42B8-A759-C7BBB0C8CD4D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDE", "BlitzBasicIDE\blitzide.vcxproj", "{B61D8348-B715-42B8-A759-C7BBB0C8CD4D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlitzBasicLauncher", "BlitzBasicLauncher\bblaunch.vcxproj", "{C74A383E-81B0-4679-AAC9-535C94C92EA5}" EndProject @@ -93,7 +93,6 @@ Global {B61D8348-B715-42B8-A759-C7BBB0C8CD4D}.Debug|x86.ActiveCfg = Debug|Win32 {B61D8348-B715-42B8-A759-C7BBB0C8CD4D}.Release|x64.ActiveCfg = Release|Win32 {B61D8348-B715-42B8-A759-C7BBB0C8CD4D}.Release|x86.ActiveCfg = Release|Win32 - {B61D8348-B715-42B8-A759-C7BBB0C8CD4D}.Release|x86.Build.0 = Release|Win32 {C74A383E-81B0-4679-AAC9-535C94C92EA5}.Debug|x64.ActiveCfg = Debug|Win32 {C74A383E-81B0-4679-AAC9-535C94C92EA5}.Debug|x86.ActiveCfg = Debug|Win32 {C74A383E-81B0-4679-AAC9-535C94C92EA5}.Debug|x86.Build.0 = Debug|Win32 diff --git a/Engine/Engine.vcxproj b/Engine/Engine.vcxproj index 22d80f1..73561ec 100644 --- a/Engine/Engine.vcxproj +++ b/Engine/Engine.vcxproj @@ -46,10 +46,10 @@ MultiByte - Application + StaticLibrary false v140 - true + false MultiByte @@ -71,10 +71,18 @@ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + + + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + + ..\#Build\$(ProjectName)\$(ConfigurationName)\ ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ - + ..\#Build\$(ProjectName)\$(ConfigurationName)\ ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ @@ -110,7 +118,22 @@ Level3 Disabled - true + false + ProgramDatabase + false + false + Speed + false + true + MultiThreadedDebug + Guard + false + true + false + false + false + false + true @@ -149,9 +172,24 @@ Level3 MaxSpeed - true + false true - true + false + false + false + false + true + true + true + false + MultiThreaded + Guard + false + false + false + Speed + false + $(IntDir)vc$(PlatformToolsetVersion).pdb true diff --git a/Linker/linker_dll.vcxproj b/Linker/linker_dll.vcxproj index f651d30..58f06f5 100644 --- a/Linker/linker_dll.vcxproj +++ b/Linker/linker_dll.vcxproj @@ -43,15 +43,15 @@ - ..\#Test\bin\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Test\bin\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -60,7 +60,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -68,18 +68,18 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 true Speed - true - true + false + false false - StdCall + Cdecl true @@ -109,16 +109,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -128,7 +128,7 @@ false false false - StdCall + Cdecl true diff --git a/LinkerLib/linker.vcxproj b/LinkerLib/linker.vcxproj index 6a84709..ef616e9 100644 --- a/LinkerLib/linker.vcxproj +++ b/LinkerLib/linker.vcxproj @@ -43,15 +43,15 @@ - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -60,7 +60,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -68,19 +68,19 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 $(IntDir)vc$(PlatformToolsetVersion).pdb true Speed - true - true + false + false false - StdCall + Cdecl 0x0409 @@ -98,16 +98,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -118,7 +118,7 @@ false false false - StdCall + Cdecl 0x0409 diff --git a/Runtime/bbruntime_dll.vcxproj b/Runtime/bbruntime_dll.vcxproj index 495da01..ada5079 100644 --- a/Runtime/bbruntime_dll.vcxproj +++ b/Runtime/bbruntime_dll.vcxproj @@ -43,15 +43,15 @@ - ..\#Test\bin\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Test\bin\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -60,7 +60,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -68,18 +68,18 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 true Speed - true - true + false + false false - StdCall + Cdecl true @@ -111,16 +111,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -130,7 +130,7 @@ false false false - StdCall + Cdecl true diff --git a/RuntimeLib/bbruntime.vcxproj b/RuntimeLib/bbruntime.vcxproj index 0713615..8547770 100644 --- a/RuntimeLib/bbruntime.vcxproj +++ b/RuntimeLib/bbruntime.vcxproj @@ -43,15 +43,15 @@ - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -60,7 +60,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -68,20 +68,20 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 $(IntDir)vc$(PlatformToolsetVersion).pdb true Speed - true - true + false + false false - StdCall + Cdecl 0x0409 @@ -99,8 +99,8 @@ MultiThreaded - OnlyExplicitInline - true + Default + false MaxSpeed true Level3 @@ -110,7 +110,7 @@ _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -120,7 +120,7 @@ false false false - StdCall + Cdecl 0x0409 diff --git a/asm_makeinsts/asm_makeinsts.vcxproj b/asm_makeinsts/asm_makeinsts.vcxproj index 8b89527..3e605a3 100644 --- a/asm_makeinsts/asm_makeinsts.vcxproj +++ b/asm_makeinsts/asm_makeinsts.vcxproj @@ -42,15 +42,15 @@ - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -58,8 +58,8 @@ MultiThreaded - OnlyExplicitInline - true + Default + false MaxSpeed true Level3 @@ -69,7 +69,7 @@ _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -77,7 +77,7 @@ false false false - StdCall + Cdecl .\Release\asm_makeinsts.tlb @@ -99,7 +99,7 @@ MultiThreadedDebug - true + false Disabled true true @@ -107,19 +107,19 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 Default true Speed - true - true + false + false false - StdCall + Cdecl .\Debug\asm_makeinsts.tlb diff --git a/blitz/blitz.vcxproj b/blitz/blitz.vcxproj index a22e543..6e50531 100644 --- a/blitz/blitz.vcxproj +++ b/blitz/blitz.vcxproj @@ -43,15 +43,15 @@ - ..\#Test\bin\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Test\bin\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -60,7 +60,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -68,19 +68,19 @@ EnableFastChecks true true - true + false false false - true + false ProgramDatabase Guard Level3 true Speed - true - true + false + false false - StdCall + Cdecl .\Debug\blitz.tlb @@ -103,16 +103,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -123,7 +123,7 @@ false false false - StdCall + Cdecl .\Release\blitz.tlb diff --git a/blitz/main.cpp b/blitz/main.cpp index b42d095..706390c 100644 --- a/blitz/main.cpp +++ b/blitz/main.cpp @@ -135,7 +135,7 @@ static void demoError() { exit(0); } -int _cdecl main(int argc, char *argv[]) { +int main(int argc, char *argv[]) { string in_file, out_file, args; @@ -144,9 +144,7 @@ int _cdecl main(int argc, char *argv[]) { bool versinfo = false; for (int k = 1; k < argc; ++k) { - string t = argv[k]; - t = tolower(t); if (t == "-h") { @@ -168,10 +166,14 @@ int _cdecl main(int argc, char *argv[]) { } else if (t == "-v") { versinfo = true; } else if (t == "-o") { - if (out_file.size() || k == argc - 1) usageErr(); + if (out_file.size() || k == argc - 1) + usageErr(); + out_file = argv[++k]; } else { - if (in_file.size() || t[0] == '-' || t[0] == '+') usageErr(); + if (in_file.size() || t[0] == '-' || t[0] == '+') + usageErr(); + in_file = argv[k]; for (++k; k < argc; ++k) { string t = argv[k]; @@ -192,14 +194,14 @@ int _cdecl main(int argc, char *argv[]) { if (dumpkeys) dumpKeys(true, true, dumphelp); if (versinfo) versInfo(); - if (!in_file.size()) return 0; - -#ifdef DEMO - if (!getenv("blitzide")) demoError(); -#endif + if (!in_file.size()) { + return 0; + } if (in_file[0] == '\"') { - if (in_file.size() < 3 || in_file[in_file.size() - 1] != '\"') usageErr(); + if ((in_file.size() < 3) || (in_file[in_file.size() - 1] != '\"')) { + usageErr(); +} in_file = in_file.substr(1, in_file.size() - 2); } diff --git a/blitz3d/blitz3d.vcxproj b/blitz3d/blitz3d.vcxproj index 711c4e5..1b32d7c 100644 --- a/blitz3d/blitz3d.vcxproj +++ b/blitz3d/blitz3d.vcxproj @@ -42,15 +42,15 @@ - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -58,16 +58,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -78,7 +78,7 @@ false false false - StdCall + Cdecl 0x0409 @@ -98,7 +98,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -107,19 +107,19 @@ $(DXSDK_INCLUDE);$(DIRECTXSDK_INCLUDE); true true - true + false false false - true + false Guard Level3 $(IntDir)vc$(PlatformToolsetVersion).pdb true Speed - true - true + false + false false - StdCall + Cdecl 0x0409 diff --git a/compiler/compiler.vcxproj b/compiler/compiler.vcxproj index 3602ddb..4e7f745 100644 --- a/compiler/compiler.vcxproj +++ b/compiler/compiler.vcxproj @@ -43,15 +43,15 @@ - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -60,7 +60,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -68,19 +68,19 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 $(IntDir)vc$(PlatformToolsetVersion).pdb true Speed - true - true + false + false false - StdCall + Cdecl 0x0409 @@ -97,16 +97,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -117,7 +117,7 @@ false false false - StdCall + Cdecl 0x0409 diff --git a/config/config.vcxproj b/config/config.vcxproj index f571d8b..f941ba0 100644 --- a/config/config.vcxproj +++ b/config/config.vcxproj @@ -43,15 +43,15 @@ - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -59,8 +59,8 @@ MultiThreaded - OnlyExplicitInline - true + Default + false MaxSpeed true Level3 @@ -70,7 +70,7 @@ _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -79,7 +79,7 @@ false false false - StdCall + Cdecl 0x0409 @@ -98,7 +98,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -106,19 +106,19 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 $(IntDir)vc$(PlatformToolsetVersion).pdb true Speed - true - true + false + false false - StdCall + Cdecl 0x0409 diff --git a/debugger/debugger.vcxproj b/debugger/debugger.vcxproj index 756708c..23c4bc5 100644 --- a/debugger/debugger.vcxproj +++ b/debugger/debugger.vcxproj @@ -44,15 +44,15 @@ - ..\#Test\bin\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Test\bin\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -60,16 +60,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -79,7 +79,7 @@ false false false - StdCall + Cdecl true @@ -107,7 +107,7 @@ MultiThreadedDebug Default - true + false Disabled true true @@ -115,18 +115,18 @@ EnableFastChecks true true - true + false false false - true + false Guard Level3 true Speed - true - true + false + false false - StdCall + Cdecl true diff --git a/gxruntime/gxruntime.vcxproj b/gxruntime/gxruntime.vcxproj index 8a0648f..a6f38e4 100644 --- a/gxruntime/gxruntime.vcxproj +++ b/gxruntime/gxruntime.vcxproj @@ -45,15 +45,15 @@ - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -61,14 +61,14 @@ MultiThreaded - OnlyExplicitInline - true + Default + false MaxSpeed true Speed true _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) - true + false true false false @@ -80,7 +80,7 @@ false false false - StdCall + Cdecl 0x0409 @@ -100,26 +100,26 @@ MultiThreadedDebug Default - true + false Disabled true _CRT_SECURE_NO_WARNINGS;WIN32;DEBUG;%(PreprocessorDefinitions) EnableFastChecks - true + false true false false true Speed true - true + false Guard Level3 $(IntDir)vc$(PlatformToolsetVersion).pdb - true - true + false + false false - StdCall + Cdecl 0x0409 diff --git a/stdutil/stdutil.vcxproj b/stdutil/stdutil.vcxproj index dd90e5f..4de4477 100644 --- a/stdutil/stdutil.vcxproj +++ b/stdutil/stdutil.vcxproj @@ -42,15 +42,15 @@ - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ false $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - ..\#Build\$(ProjectName)\$(ConfigurationName)\ - ..\#Intermediate\$(ProjectName)\$(ConfigurationName)\ + ..\#Build\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ + ..\#Intermediate\$(ProjectName)\$(ConfigurationName)-$(PlatformTarget)\ true $(DXSDK_DIR)Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath); $(DXSDK_DIR)Lib\x86\;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 @@ -58,16 +58,16 @@ MultiThreaded - OnlyExplicitInline + Default true - true + false MaxSpeed true Level3 _CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions) true true - true + false false false false @@ -78,7 +78,7 @@ false false false - StdCall + Cdecl 0x0409 @@ -103,21 +103,21 @@ _CRT_SECURE_NO_WARNINGS;WIN32;DEBUG;%(PreprocessorDefinitions) true EnableFastChecks - true + false true - true + false false false - true + false Guard Level3 $(IntDir)vc$(PlatformToolsetVersion).pdb true Speed - true - true + false + false false - StdCall + Cdecl 0x0409