diff --git a/stepmania/src/plib-1.6.0/plib.sln b/stepmania/src/plib-1.6.0/plib.sln index 7931c31a2f..eb0548b5e9 100644 --- a/stepmania/src/plib-1.6.0/plib.sln +++ b/stepmania/src/plib-1.6.0/plib.sln @@ -1,23 +1,23 @@ Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fnt", "src\fnt\fnt.vcproj", "{3ADE9BBC-8DA8-4832-A2C6-C1FBE81B7A2A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fnt", "src\fnt\fnt.vcproj", "{C38984FE-606C-4AB7-A085-0B4B67380DB2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "src\js\js.vcproj", "{A3BA5F21-EEA9-4C91-8A49-D5E57B9B1435}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "js", "src\js\js.vcproj", "{BF3C0B09-CA52-4474-971A-789C28D58B62}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "src\net\net.vcproj", "{746EE86D-AA6E-4F20-A94D-46C04D16DA97}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "src\net\net.vcproj", "{B5945775-CD67-47BD-9B76-BC23FF7F82C9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plib", "plib.vcproj", "{7D4C2E18-484B-4799-849E-9122C4F09687}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plib", "plib.vcproj", "{DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pui", "src\pui\pui.vcproj", "{8BC30CD6-8998-4854-A92E-D7BC5F825639}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pui", "src\pui\pui.vcproj", "{9BB9135A-A912-4F97-9BEC-D176525A96D7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sg", "src\sg\sg.vcproj", "{35DD3F5C-B773-49BF-AB3E-17C44DE5ADF4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sg", "src\sg\sg.vcproj", "{78153ECD-1959-4F37-AECC-942ECB2BDF6C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl", "src\sl\sl.vcproj", "{38C361A1-0E06-4C11-ABE1-721CCD9EDF9B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl", "src\sl\sl.vcproj", "{FD40B4F6-A143-4088-BCC0-31747992C2C9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssg", "src\ssg\ssg.vcproj", "{A4FAD4A1-515C-4516-89F5-4CDBE0D689D9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssg", "src\ssg\ssg.vcproj", "{70AE43E6-807B-4E59-893B-61EAE79F99BD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssgAux", "src\ssgAux\ssgAux.vcproj", "{112FD701-405D-4DF2-933A-9811EEE4B1E2}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssgAux", "src\ssgAux\ssgAux.vcproj", "{EEA08291-2AE0-49FA-853D-073961AFC7BA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ul", "src\util\ul.vcproj", "{9D54C066-94F5-4108-8CAD-C4FD3648974C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ul", "src\util\ul.vcproj", "{35562F7E-DEB3-414C-B994-9967BFFE2D90}" EndProject Global GlobalSection(SolutionConfiguration) = preSolution @@ -25,43 +25,58 @@ Global ConfigName.1 = Release EndGlobalSection GlobalSection(ProjectDependencies) = postSolution - {7D4C2E18-484B-4799-849E-9122C4F09687}.0 = {746EE86D-AA6E-4F20-A94D-46C04D16DA97} - {7D4C2E18-484B-4799-849E-9122C4F09687}.1 = {112FD701-405D-4DF2-933A-9811EEE4B1E2} - {7D4C2E18-484B-4799-849E-9122C4F09687}.2 = {9D54C066-94F5-4108-8CAD-C4FD3648974C} - {7D4C2E18-484B-4799-849E-9122C4F09687}.3 = {8BC30CD6-8998-4854-A92E-D7BC5F825639} - {7D4C2E18-484B-4799-849E-9122C4F09687}.4 = {A4FAD4A1-515C-4516-89F5-4CDBE0D689D9} - {7D4C2E18-484B-4799-849E-9122C4F09687}.5 = {38C361A1-0E06-4C11-ABE1-721CCD9EDF9B} - {7D4C2E18-484B-4799-849E-9122C4F09687}.6 = {35DD3F5C-B773-49BF-AB3E-17C44DE5ADF4} - {7D4C2E18-484B-4799-849E-9122C4F09687}.7 = {A3BA5F21-EEA9-4C91-8A49-D5E57B9B1435} - {7D4C2E18-484B-4799-849E-9122C4F09687}.8 = {3ADE9BBC-8DA8-4832-A2C6-C1FBE81B7A2A} - {8BC30CD6-8998-4854-A92E-D7BC5F825639}.0 = {35DD3F5C-B773-49BF-AB3E-17C44DE5ADF4} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.0 = {B5945775-CD67-47BD-9B76-BC23FF7F82C9} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.1 = {EEA08291-2AE0-49FA-853D-073961AFC7BA} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.2 = {35562F7E-DEB3-414C-B994-9967BFFE2D90} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.3 = {9BB9135A-A912-4F97-9BEC-D176525A96D7} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.4 = {70AE43E6-807B-4E59-893B-61EAE79F99BD} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.5 = {FD40B4F6-A143-4088-BCC0-31747992C2C9} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.6 = {78153ECD-1959-4F37-AECC-942ECB2BDF6C} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.7 = {BF3C0B09-CA52-4474-971A-789C28D58B62} + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.8 = {C38984FE-606C-4AB7-A085-0B4B67380DB2} + {9BB9135A-A912-4F97-9BEC-D176525A96D7}.0 = {78153ECD-1959-4F37-AECC-942ECB2BDF6C} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution - {3ADE9BBC-8DA8-4832-A2C6-C1FBE81B7A2A}.Debug.ActiveCfg = Debug|Win32 - {3ADE9BBC-8DA8-4832-A2C6-C1FBE81B7A2A}.Release.ActiveCfg = Release|Win32 - {A3BA5F21-EEA9-4C91-8A49-D5E57B9B1435}.Debug.ActiveCfg = Debug|Win32 - {A3BA5F21-EEA9-4C91-8A49-D5E57B9B1435}.Release.ActiveCfg = Release|Win32 - {746EE86D-AA6E-4F20-A94D-46C04D16DA97}.Debug.ActiveCfg = Debug|Win32 - {746EE86D-AA6E-4F20-A94D-46C04D16DA97}.Release.ActiveCfg = Release|Win32 - {7D4C2E18-484B-4799-849E-9122C4F09687}.Debug.ActiveCfg = Debug|Win32 - {7D4C2E18-484B-4799-849E-9122C4F09687}.Release.ActiveCfg = Release|Win32 - {7D4C2E18-484B-4799-849E-9122C4F09687}.Release.Build.0 = Release|Win32 - {8BC30CD6-8998-4854-A92E-D7BC5F825639}.Debug.ActiveCfg = Debug|Win32 - {8BC30CD6-8998-4854-A92E-D7BC5F825639}.Release.ActiveCfg = Release|Win32 - {35DD3F5C-B773-49BF-AB3E-17C44DE5ADF4}.Debug.ActiveCfg = Debug|Win32 - {35DD3F5C-B773-49BF-AB3E-17C44DE5ADF4}.Debug.Build.0 = Debug|Win32 - {35DD3F5C-B773-49BF-AB3E-17C44DE5ADF4}.Release.ActiveCfg = Release|Win32 - {35DD3F5C-B773-49BF-AB3E-17C44DE5ADF4}.Release.Build.0 = Release|Win32 - {38C361A1-0E06-4C11-ABE1-721CCD9EDF9B}.Debug.ActiveCfg = Debug|Win32 - {38C361A1-0E06-4C11-ABE1-721CCD9EDF9B}.Release.ActiveCfg = Release|Win32 - {A4FAD4A1-515C-4516-89F5-4CDBE0D689D9}.Debug.ActiveCfg = Debug|Win32 - {A4FAD4A1-515C-4516-89F5-4CDBE0D689D9}.Release.ActiveCfg = Release|Win32 - {112FD701-405D-4DF2-933A-9811EEE4B1E2}.Debug.ActiveCfg = Debug|Win32 - {112FD701-405D-4DF2-933A-9811EEE4B1E2}.Release.ActiveCfg = Release|Win32 - {9D54C066-94F5-4108-8CAD-C4FD3648974C}.Debug.ActiveCfg = Debug|Win32 - {9D54C066-94F5-4108-8CAD-C4FD3648974C}.Debug.Build.0 = Debug|Win32 - {9D54C066-94F5-4108-8CAD-C4FD3648974C}.Release.ActiveCfg = Release|Win32 - {9D54C066-94F5-4108-8CAD-C4FD3648974C}.Release.Build.0 = Release|Win32 + {C38984FE-606C-4AB7-A085-0B4B67380DB2}.Debug.ActiveCfg = Debug|Win32 + {C38984FE-606C-4AB7-A085-0B4B67380DB2}.Debug.Build.0 = Debug|Win32 + {C38984FE-606C-4AB7-A085-0B4B67380DB2}.Release.ActiveCfg = Release|Win32 + {C38984FE-606C-4AB7-A085-0B4B67380DB2}.Release.Build.0 = Release|Win32 + {BF3C0B09-CA52-4474-971A-789C28D58B62}.Debug.ActiveCfg = Debug|Win32 + {BF3C0B09-CA52-4474-971A-789C28D58B62}.Debug.Build.0 = Debug|Win32 + {BF3C0B09-CA52-4474-971A-789C28D58B62}.Release.ActiveCfg = Release|Win32 + {BF3C0B09-CA52-4474-971A-789C28D58B62}.Release.Build.0 = Release|Win32 + {B5945775-CD67-47BD-9B76-BC23FF7F82C9}.Debug.ActiveCfg = Debug|Win32 + {B5945775-CD67-47BD-9B76-BC23FF7F82C9}.Debug.Build.0 = Debug|Win32 + {B5945775-CD67-47BD-9B76-BC23FF7F82C9}.Release.ActiveCfg = Release|Win32 + {B5945775-CD67-47BD-9B76-BC23FF7F82C9}.Release.Build.0 = Release|Win32 + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.Debug.ActiveCfg = Debug|Win32 + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.Debug.Build.0 = Debug|Win32 + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.Release.ActiveCfg = Release|Win32 + {DF80EB7B-C8DC-4FE4-8AA9-9127D94C5FC8}.Release.Build.0 = Release|Win32 + {9BB9135A-A912-4F97-9BEC-D176525A96D7}.Debug.ActiveCfg = Debug|Win32 + {9BB9135A-A912-4F97-9BEC-D176525A96D7}.Debug.Build.0 = Debug|Win32 + {9BB9135A-A912-4F97-9BEC-D176525A96D7}.Release.ActiveCfg = Release|Win32 + {9BB9135A-A912-4F97-9BEC-D176525A96D7}.Release.Build.0 = Release|Win32 + {78153ECD-1959-4F37-AECC-942ECB2BDF6C}.Debug.ActiveCfg = Debug|Win32 + {78153ECD-1959-4F37-AECC-942ECB2BDF6C}.Debug.Build.0 = Debug|Win32 + {78153ECD-1959-4F37-AECC-942ECB2BDF6C}.Release.ActiveCfg = Release|Win32 + {78153ECD-1959-4F37-AECC-942ECB2BDF6C}.Release.Build.0 = Release|Win32 + {FD40B4F6-A143-4088-BCC0-31747992C2C9}.Debug.ActiveCfg = Debug|Win32 + {FD40B4F6-A143-4088-BCC0-31747992C2C9}.Debug.Build.0 = Debug|Win32 + {FD40B4F6-A143-4088-BCC0-31747992C2C9}.Release.ActiveCfg = Release|Win32 + {FD40B4F6-A143-4088-BCC0-31747992C2C9}.Release.Build.0 = Release|Win32 + {70AE43E6-807B-4E59-893B-61EAE79F99BD}.Debug.ActiveCfg = Debug|Win32 + {70AE43E6-807B-4E59-893B-61EAE79F99BD}.Debug.Build.0 = Debug|Win32 + {70AE43E6-807B-4E59-893B-61EAE79F99BD}.Release.ActiveCfg = Release|Win32 + {70AE43E6-807B-4E59-893B-61EAE79F99BD}.Release.Build.0 = Release|Win32 + {EEA08291-2AE0-49FA-853D-073961AFC7BA}.Debug.ActiveCfg = Debug|Win32 + {EEA08291-2AE0-49FA-853D-073961AFC7BA}.Debug.Build.0 = Debug|Win32 + {EEA08291-2AE0-49FA-853D-073961AFC7BA}.Release.ActiveCfg = Release|Win32 + {EEA08291-2AE0-49FA-853D-073961AFC7BA}.Release.Build.0 = Release|Win32 + {35562F7E-DEB3-414C-B994-9967BFFE2D90}.Debug.ActiveCfg = Debug|Win32 + {35562F7E-DEB3-414C-B994-9967BFFE2D90}.Debug.Build.0 = Debug|Win32 + {35562F7E-DEB3-414C-B994-9967BFFE2D90}.Release.ActiveCfg = Release|Win32 + {35562F7E-DEB3-414C-B994-9967BFFE2D90}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/stepmania/src/plib-1.6.0/sg.lib b/stepmania/src/plib-1.6.0/sg.lib index 57380e87a1..49484750b6 100644 Binary files a/stepmania/src/plib-1.6.0/sg.lib and b/stepmania/src/plib-1.6.0/sg.lib differ diff --git a/stepmania/src/plib-1.6.0/src/fnt/fnt.dsp b/stepmania/src/plib-1.6.0/src/fnt/fnt.dsp index 70d92f4490..ac01935fbc 100644 --- a/stepmania/src/plib-1.6.0/src/fnt/fnt.dsp +++ b/stepmania/src/plib-1.6.0/src/fnt/fnt.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\sg" /I "..\util" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\sg" /I "..\util" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -70,8 +70,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* copy fnt.h ..\..\fnt.h # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\sg" /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "..\sg" /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/stepmania/src/plib-1.6.0/src/fnt/fnt.vcproj b/stepmania/src/plib-1.6.0/src/fnt/fnt.vcproj index 8c049c6d9f..03c4de907f 100644 --- a/stepmania/src/plib-1.6.0/src/fnt/fnt.vcproj +++ b/stepmania/src/plib-1.6.0/src/fnt/fnt.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="..\sg,..\util" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/fnt.pch" AssemblerListingLocation=".\Release/" @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/> @@ -73,20 +73,20 @@ copy fnt.h ..\..\fnt.h AdditionalIncludeDirectories="..\sg,..\util" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/fnt.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/stepmania/src/plib-1.6.0/src/js/js.dsp b/stepmania/src/plib-1.6.0/src/js/js.dsp index ebb9fe0c43..e89b65240e 100644 --- a/stepmania/src/plib-1.6.0/src/js/js.dsp +++ b/stepmania/src/plib-1.6.0/src/js/js.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\util" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\util" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -70,8 +70,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* copy js.h ..\..\js.h # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/stepmania/src/plib-1.6.0/src/js/js.vcproj b/stepmania/src/plib-1.6.0/src/js/js.vcproj index bc503e4b6d..37725d22da 100644 --- a/stepmania/src/plib-1.6.0/src/js/js.vcproj +++ b/stepmania/src/plib-1.6.0/src/js/js.vcproj @@ -24,20 +24,20 @@ AdditionalIncludeDirectories="..\util" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/js.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0" + DebugInformationFormat="4" CompileAs="0"/> @@ -72,7 +72,7 @@ copy js.h ..\..\js.h AdditionalIncludeDirectories="..\util" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/js.pch" AssemblerListingLocation=".\Release/" @@ -85,7 +85,7 @@ copy js.h ..\..\js.h Name="VCCustomBuildTool"/> diff --git a/stepmania/src/plib-1.6.0/src/net/net.dsp b/stepmania/src/plib-1.6.0/src/net/net.dsp index 182d6cc882..d91c71c991 100644 --- a/stepmania/src/plib-1.6.0/src/net/net.dsp +++ b/stepmania/src/plib-1.6.0/src/net/net.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\util" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\util" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -102,8 +102,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /Gm /GX /Zi /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/stepmania/src/plib-1.6.0/src/net/net.vcproj b/stepmania/src/plib-1.6.0/src/net/net.vcproj index 36d0e47fa3..13b636ab17 100644 --- a/stepmania/src/plib-1.6.0/src/net/net.vcproj +++ b/stepmania/src/plib-1.6.0/src/net/net.vcproj @@ -24,14 +24,14 @@ AdditionalIncludeDirectories="..\util" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/net.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0" + DebugInformationFormat="4" CompileAs="0"/> @@ -79,7 +79,7 @@ copy $(ProjectDir)netSocket.h $(ProjectDir)..\..\netSocket.h AdditionalIncludeDirectories="..\util" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/net.pch" AssemblerListingLocation=".\Release/" @@ -101,7 +101,7 @@ copy $(ProjectDir)netSocket.h $(ProjectDir)..\..\netSocket.h Outputs="$(ProjectDir)..\..\netBuffer.h;$(ProjectDir)..\..\netChannel.h;$(ProjectDir)..\..\netChat.h;$(ProjectDir)..\..\netMessage.h;$(ProjectDir)..\..\netMonitor.h;$(ProjectDir)..\..\netSocket.h"/> diff --git a/stepmania/src/plib-1.6.0/src/pui/pui.dsp b/stepmania/src/plib-1.6.0/src/pui/pui.dsp index 4c5a57d0eb..380ff351e6 100644 --- a/stepmania/src/plib-1.6.0/src/pui/pui.dsp +++ b/stepmania/src/plib-1.6.0/src/pui/pui.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\fnt" /I "..\sg" /I "..\util" /I "../../../glut/include" /I "../../glut/include" /I ".." /I "../glut/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "GLUT_IS_PRESENT" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\fnt" /I "..\sg" /I "..\util" /I "../../../glut/include" /I "../../glut/include" /I ".." /I "../glut/include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "GLUT_IS_PRESENT" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -70,8 +70,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* copy pu.h ..\..\pu.h # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\fnt" /I "..\sg" /I "..\util" /I "../../../glut/include" /I "../../glut/include" /I ".." /I "../glut/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "GLUT_IS_PRESENT" /FR /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "..\fnt" /I "..\sg" /I "..\util" /I "../../../glut/include" /I "../../glut/include" /I ".." /I "../glut/include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "GLUT_IS_PRESENT" /FR /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/stepmania/src/plib-1.6.0/src/pui/pui.vcproj b/stepmania/src/plib-1.6.0/src/pui/pui.vcproj index 71df6e3d50..76fe1c5673 100644 --- a/stepmania/src/plib-1.6.0/src/pui/pui.vcproj +++ b/stepmania/src/plib-1.6.0/src/pui/pui.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="..\fnt,..\sg,..\util,../../../glut/include,../../glut/include,..,../glut/include" PreprocessorDefinitions="WIN32,NDEBUG,_LIB,GLUT_IS_PRESENT" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/pui.pch" AssemblerListingLocation=".\Release/" @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/> @@ -73,7 +73,7 @@ copy pu.h ..\..\pu.h AdditionalIncludeDirectories="..\fnt,..\sg,..\util,../../../glut/include,../../glut/include,..,../glut/include" PreprocessorDefinitions="WIN32,_DEBUG,_LIB,GLUT_IS_PRESENT" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/pui.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" @@ -81,13 +81,13 @@ copy pu.h ..\..\pu.h BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/stepmania/src/plib-1.6.0/src/sg/sg.dsp b/stepmania/src/plib-1.6.0/src/sg/sg.dsp index 6fdbc7aabd..4373c256d3 100644 --- a/stepmania/src/plib-1.6.0/src/sg/sg.dsp +++ b/stepmania/src/plib-1.6.0/src/sg/sg.dsp @@ -70,8 +70,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* copy sg.h ..\..\sg.h # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "..\util" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/stepmania/src/plib-1.6.0/src/sg/sg.vcproj b/stepmania/src/plib-1.6.0/src/sg/sg.vcproj index c8f1a200c1..97b6ad868e 100644 --- a/stepmania/src/plib-1.6.0/src/sg/sg.vcproj +++ b/stepmania/src/plib-1.6.0/src/sg/sg.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="..\util" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/sg.pch" AssemblerListingLocation=".\Release/" @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/> @@ -73,20 +73,20 @@ copy sg.h ..\..\sg.h AdditionalIncludeDirectories="..\util" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/sg.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/stepmania/src/plib-1.6.0/src/sl/sl.dsp b/stepmania/src/plib-1.6.0/src/sl/sl.dsp index c5a538e39d..5d3f1328d4 100644 --- a/stepmania/src/plib-1.6.0/src/sl/sl.dsp +++ b/stepmania/src/plib-1.6.0/src/sl/sl.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /Zi /O2 /I "..\util" /I ".." /D "NDEBUG" /D "_LIB" /D "NEEDNAMESPACESTD" /D "HAVE_CONFIG_H" /D "HAVE_WINDOWS_H" /D "WIN32" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "..\util" /I ".." /D "NDEBUG" /D "_LIB" /D "NEEDNAMESPACESTD" /D "HAVE_CONFIG_H" /D "HAVE_WINDOWS_H" /D "WIN32" /D "_MBCS" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -70,8 +70,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* copy sl.h ..\..\sl.h copy slPortab # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\util" /I ".." /D "_DEBUG" /D "_LIB" /D "NEEDNAMESPACESTD" /D "HAVE_CONFIG_H" /D "HAVE_WINDOWS_H" /D "WIN32" /D "_MBCS" /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "..\util" /I ".." /D "_DEBUG" /D "_LIB" /D "NEEDNAMESPACESTD" /D "HAVE_CONFIG_H" /D "HAVE_WINDOWS_H" /D "WIN32" /D "_MBCS" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/stepmania/src/plib-1.6.0/src/sl/sl.vcproj b/stepmania/src/plib-1.6.0/src/sl/sl.vcproj index 20193245a4..1186df920d 100644 --- a/stepmania/src/plib-1.6.0/src/sl/sl.vcproj +++ b/stepmania/src/plib-1.6.0/src/sl/sl.vcproj @@ -24,7 +24,7 @@ AdditionalIncludeDirectories="..\util,.." PreprocessorDefinitions="NDEBUG,_LIB,NEEDNAMESPACESTD,HAVE_CONFIG_H,HAVE_WINDOWS_H,WIN32" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/sl.pch" AssemblerListingLocation=".\Release/" @@ -38,7 +38,7 @@ Name="VCCustomBuildTool"/> @@ -75,20 +75,20 @@ copy sm.h ..\..\sm.h AdditionalIncludeDirectories="..\util,.." PreprocessorDefinitions="_DEBUG,_LIB,NEEDNAMESPACESTD,HAVE_CONFIG_H,HAVE_WINDOWS_H,WIN32" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/sl.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="0"/> diff --git a/stepmania/src/plib-1.6.0/src/ssg/ssg.dsp b/stepmania/src/plib-1.6.0/src/ssg/ssg.dsp index adde19274c..99ebd5cce4 100644 --- a/stepmania/src/plib-1.6.0/src/ssg/ssg.dsp +++ b/stepmania/src/plib-1.6.0/src/ssg/ssg.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\sg" /I "..\util" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PROXY_TEXTURES_ARE_NOT_BROKEN" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\sg" /I "..\util" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PROXY_TEXTURES_ARE_NOT_BROKEN" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -70,8 +70,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* copy ssg.h ..\..\ssg.h copy ssgconf. # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\sg" /I "..\util" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PROXY_TEXTURES_ARE_NOT_BROKEN" /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "..\sg" /I "..\util" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "PROXY_TEXTURES_ARE_NOT_BROKEN" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -222,10 +221,6 @@ SOURCE=.\ssgLoadMD2.cxx # End Source File # Begin Source File -SOURCE=.\ssgLoadMDL_BGLTexture.cxx -# End Source File -# Begin Source File - SOURCE=.\ssgLoadMDL.cxx # End Source File # Begin Source File @@ -234,6 +229,10 @@ SOURCE=.\ssgLoadMDL.h # End Source File # Begin Source File +SOURCE=.\ssgLoadMDL_BGLTexture.cxx +# End Source File +# Begin Source File + SOURCE=.\ssgLoadOBJ.cxx # End Source File # Begin Source File diff --git a/stepmania/src/plib-1.6.0/src/ssg/ssg.vcproj b/stepmania/src/plib-1.6.0/src/ssg/ssg.vcproj index c8afd7425d..ec4913deb4 100644 --- a/stepmania/src/plib-1.6.0/src/ssg/ssg.vcproj +++ b/stepmania/src/plib-1.6.0/src/ssg/ssg.vcproj @@ -24,20 +24,20 @@ AdditionalIncludeDirectories="..\sg,..\util" PreprocessorDefinitions="_DEBUG,WIN32,_LIB,PROXY_TEXTURES_ARE_NOT_BROKEN" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/ssg.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="0"/> @@ -75,7 +75,7 @@ copy ssgKeyFlier.h ..\..\ssgKeyFlier.h AdditionalIncludeDirectories="..\sg,..\util" PreprocessorDefinitions="NDEBUG,WIN32,_LIB,PROXY_TEXTURES_ARE_NOT_BROKEN" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/ssg.pch" AssemblerListingLocation=".\Release/" @@ -89,7 +89,7 @@ copy ssgKeyFlier.h ..\..\ssgKeyFlier.h Name="VCCustomBuildTool"/> diff --git a/stepmania/src/plib-1.6.0/src/ssgAux/ssgAux.dsp b/stepmania/src/plib-1.6.0/src/ssgAux/ssgAux.dsp index eafe5d6af0..f813472827 100644 --- a/stepmania/src/plib-1.6.0/src/ssgAux/ssgAux.dsp +++ b/stepmania/src/plib-1.6.0/src/ssgAux/ssgAux.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "..\sg" /I "..\util" /I "..\ssg" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\sg" /I "..\util" /I "..\ssg" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" @@ -70,8 +70,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* copy ssgAux.h ..\..\ssgAux.h copy ss # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "..\sg" /I "..\util" /I "..\ssg" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /I "..\sg" /I "..\util" /I "..\ssg" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe @@ -125,11 +124,11 @@ SOURCE=.\ssgaTeapot.cxx # End Source File # Begin Source File -SOURCE=.\ssgaWaveSystem.cxx +SOURCE=.\ssgAux.cxx # End Source File # Begin Source File -SOURCE=.\ssgAux.cxx +SOURCE=.\ssgaWaveSystem.cxx # End Source File # End Group # Begin Group "Header Files" @@ -153,11 +152,11 @@ SOURCE=.\ssgaShapes.h # End Source File # Begin Source File -SOURCE=.\ssgaWaveSystem.h +SOURCE=.\ssgAux.h # End Source File # Begin Source File -SOURCE=.\ssgAux.h +SOURCE=.\ssgaWaveSystem.h # End Source File # End Group # End Target diff --git a/stepmania/src/plib-1.6.0/src/ssgAux/ssgAux.vcproj b/stepmania/src/plib-1.6.0/src/ssgAux/ssgAux.vcproj index cc8e25c034..282a0b94b2 100644 --- a/stepmania/src/plib-1.6.0/src/ssgAux/ssgAux.vcproj +++ b/stepmania/src/plib-1.6.0/src/ssgAux/ssgAux.vcproj @@ -24,20 +24,20 @@ AdditionalIncludeDirectories="..\sg,..\util,..\ssg" PreprocessorDefinitions="_DEBUG,WIN32,_LIB" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/ssgAux.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0" + DebugInformationFormat="3" CompileAs="0"/> @@ -77,7 +77,7 @@ copy ssgaWaveSystem.h ..\..\ssgaWaveSystem.h AdditionalIncludeDirectories="..\sg,..\util,..\ssg" PreprocessorDefinitions="NDEBUG,WIN32,_LIB" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/ssgAux.pch" AssemblerListingLocation=".\Release/" @@ -91,7 +91,7 @@ copy ssgaWaveSystem.h ..\..\ssgaWaveSystem.h Name="VCCustomBuildTool"/> diff --git a/stepmania/src/plib-1.6.0/src/util/ul.dsp b/stepmania/src/plib-1.6.0/src/util/ul.dsp index 62df1359d6..6324eae0e0 100644 --- a/stepmania/src/plib-1.6.0/src/util/ul.dsp +++ b/stepmania/src/plib-1.6.0/src/util/ul.dsp @@ -70,8 +70,7 @@ PostBuild_Cmds=copy release\*.lib ..\..\*.* copy ul.h ..\..\ul.h copy ulRTTI.h . # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /GZ /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/stepmania/src/plib-1.6.0/src/util/ul.vcproj b/stepmania/src/plib-1.6.0/src/util/ul.vcproj index d7915c04c8..238fe78102 100644 --- a/stepmania/src/plib-1.6.0/src/util/ul.vcproj +++ b/stepmania/src/plib-1.6.0/src/util/ul.vcproj @@ -23,19 +23,19 @@ Optimization="0" PreprocessorDefinitions="WIN32,_DEBUG,_LIB" BasicRuntimeChecks="0" - RuntimeLibrary="1" + RuntimeLibrary="2" PrecompiledHeaderFile=".\Debug/ul.pch" AssemblerListingLocation=".\Debug/" ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="0"/> + DebugInformationFormat="3"/> @@ -70,7 +70,7 @@ copy ulRTTI.h ..\..\ulRTTI.h InlineFunctionExpansion="1" PreprocessorDefinitions="WIN32,NDEBUG,_LIB" StringPooling="TRUE" - RuntimeLibrary="0" + RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\Release/ul.pch" AssemblerListingLocation=".\Release/" @@ -83,7 +83,7 @@ copy ulRTTI.h ..\..\ulRTTI.h Name="VCCustomBuildTool"/> diff --git a/stepmania/src/plib-1.6.0/ul.lib b/stepmania/src/plib-1.6.0/ul.lib index f894fe11f9..b66738d73a 100644 Binary files a/stepmania/src/plib-1.6.0/ul.lib and b/stepmania/src/plib-1.6.0/ul.lib differ