From ab63107823ab3c320d0830d84f1e875b9e6d2f65 Mon Sep 17 00:00:00 2001 From: Brodie Thiesfield Date: Tue, 30 Jun 2009 09:29:17 +0000 Subject: build with VC2008 no warnings --- SimpleIni.h | 4 + SimpleIni.sln | 40 +++--- SimpleIni.vcproj | 362 +++++++++++++++++++++++++++++++++++++------------------ test.cmd | 8 ++ 4 files changed, 278 insertions(+), 136 deletions(-) diff --git a/SimpleIni.h b/SimpleIni.h index b5a526a..69ad663 100644 --- a/SimpleIni.h +++ b/SimpleIni.h @@ -1978,7 +1978,11 @@ CSimpleIniTempl::SetLongValue( // convert to an ASCII string char szInput[64]; +#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE + sprintf_s(szInput, a_bUseHex ? "0x%lx" : "%ld", a_nValue); +#else // !__STDC_WANT_SECURE_LIB__ sprintf(szInput, a_bUseHex ? "0x%lx" : "%ld", a_nValue); +#endif // __STDC_WANT_SECURE_LIB__ // convert to output text SI_CHAR szOutput[64]; diff --git a/SimpleIni.sln b/SimpleIni.sln index 6fd8a73..5911b39 100644 --- a/SimpleIni.sln +++ b/SimpleIni.sln @@ -1,29 +1,25 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleIni", "SimpleIni.vcproj", "{C23240A6-AA9D-4827-AF06-C98E97CA6DFB}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Debug Unicode = Debug Unicode - Release = Release - Release Unicode = Release Unicode + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Unicode|Win32 = Debug Unicode|Win32 + Debug|Win32 = Debug|Win32 + Release Unicode|Win32 = Release Unicode|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 + {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 + {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug|Win32.ActiveCfg = Debug|Win32 + {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug|Win32.Build.0 = Debug|Win32 + {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 + {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 + {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release|Win32.ActiveCfg = Release|Win32 + {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug.ActiveCfg = Debug|Win32 - {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug.Build.0 = Debug|Win32 - {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug Unicode.ActiveCfg = Debug Unicode|Win32 - {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Debug Unicode.Build.0 = Debug Unicode|Win32 - {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release.ActiveCfg = Release|Win32 - {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release.Build.0 = Release|Win32 - {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release Unicode.ActiveCfg = Release Unicode|Win32 - {C23240A6-AA9D-4827-AF06-C98E97CA6DFB}.Release Unicode.Build.0 = Release Unicode|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/SimpleIni.vcproj b/SimpleIni.vcproj index e5ee0db..f6db4a2 100644 --- a/SimpleIni.vcproj +++ b/SimpleIni.vcproj @@ -1,203 +1,324 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="1" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="1" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + - - - + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> @@ -206,83 +327,96 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\snippets.cpp" + > + RelativePath=".\test1.cpp" + > + RelativePath=".\testsi.cpp" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\SimpleIni.h" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + RelativePath=".\Makefile" + > + RelativePath=".\testsi-EUCJP.ini" + > + RelativePath=".\testsi-SJIS.ini" + > + RelativePath=".\testsi-UTF8.ini" + > + > + RelativePath=".\ConvertUTF.c" + > + RelativePath=".\ConvertUTF.h" + > + > + RelativePath=".\simpleini.doxy" + > + Name="Debug|Win32" + > + CommandLine="if not exist "C:\Program Files\doxygen\bin\doxygen.exe" goto done echo Generating documentation... "C:\Program Files\doxygen\bin\doxygen.exe" $(InputDir)simpleini.doxy :done " + Outputs="d:\src\simpleini-doc\html\index.html" + /> + > + RelativePath=".\test1-expected.ini" + > + RelativePath=".\test1-input.ini" + > + RelativePath=".\test1-output.ini" + > diff --git a/test.cmd b/test.cmd index 2181328..2d319d5 100644 --- a/test.cmd +++ b/test.cmd @@ -4,10 +4,18 @@ Debug\testsi.exe -u -m -l test1-input.ini > test1-blah.ini fc test1-expected.ini test1-output.ini if errorlevel 1 goto error +"Debug Unicode\testsi.exe" -u -m -l test1-input.ini > test1-blah.ini +fc test1-expected.ini test1-output.ini +if errorlevel 1 goto error + Release\testsi.exe -u -m -l test1-input.ini > test1-blah.ini fc test1-expected.ini test1-output.ini if errorlevel 1 goto error +"Release Unicode\testsi.exe" -u -m -l test1-input.ini > test1-blah.ini +fc test1-expected.ini test1-output.ini +if errorlevel 1 goto error + exit /b 0 :error -- cgit v1.2.3