diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-02-07 11:35:47 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2014-02-07 11:35:47 +0800 |
| commit | 7053ea79f4c90f26e7e25c598a6a1617fbcea990 (patch) | |
| tree | fb5d0fb3de44e88fe1182b3a879105c16e775dab | |
| parent | 7b865790ae3233a0636fdc780f843143a7e94a01 (diff) | |
| download | json-glib-7053ea79f4c90f26e7e25c598a6a1617fbcea990.tar.gz | |
Overhaul the Visual Studio 2008 Projects
Split up the property sheets used to build JSON-GLib, and make all the
projects (*.vcproj) and property sheets (*.vsprops) use UNIX line endings
to simplify future maintenance. Also add projects to build and "install"
the json-glib-validate and json-glib-format tools.
Move the introspection file generation out of the Visual Studio projects
to add an NMake Makefile later to generate the introspection files, to make
the process clearer to people.
Stop installing the test programs, although they continue to be built from
the projects for now.
Similar changes to the Visual Studio 2010 projects will follow.
25 files changed, 1821 insertions, 1586 deletions
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index b9359aa..8e24fc0 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -1,16 +1,23 @@ NULL = EXTRA_DIST = \ + json-glib.sln \ + json-glib-version-paths.vsprops \ + json-glib-build-defines.vsprops \ + json-glib-gen-srcs.vsprops \ + json-glib-install.vsprops \ + json-glib.vcproj \ + json-glib.vcprojin \ + json-glib-validate.vcproj \ + json-glib-format.vcproj \ + install.vcproj \ + README.txt \ array.vcproj \ boxed.vcproj \ builder.vcproj \ generator.vcproj \ gvariant.vcproj \ - install.vcproj \ - json-glib.sln \ - json-glib.vcproj \ - json-glib.vcprojin \ - json-glib.vsprops \ + invalid.vcproj \ node.vcproj \ object.vcproj \ parser.vcproj \ @@ -19,7 +26,4 @@ EXTRA_DIST = \ serialize-complex.vcproj \ serialize-full.vcproj \ serialize-simple.vcproj \ - invalid.vcproj \ - README.txt \ - gengir.vcproj \ $(NULL) diff --git a/build/win32/vs9/array.vcproj b/build/win32/vs9/array.vcproj index 0f8116c..77c6f03 100644 --- a/build/win32/vs9/array.vcproj +++ b/build/win32/vs9/array.vcproj @@ -1,153 +1,153 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="array"
- ProjectGUID="{9B2921C9-577F-418D-8341-6D79771DDCEC}"
- RootNamespace="array"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Sources"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File RelativePath="..\..\..\json-glib\tests\array.c" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="array" + ProjectGUID="{9B2921C9-577F-418D-8341-6D79771DDCEC}" + RootNamespace="array" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\tests\array.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/boxed.vcproj b/build/win32/vs9/boxed.vcproj index 438156d..61f3891 100644 --- a/build/win32/vs9/boxed.vcproj +++ b/build/win32/vs9/boxed.vcproj @@ -22,7 +22,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" CharacterSet="2" > <Tool @@ -51,7 +51,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" > @@ -78,7 +78,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > @@ -112,7 +112,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" diff --git a/build/win32/vs9/builder.vcproj b/build/win32/vs9/builder.vcproj index a680960..cc00f7a 100644 --- a/build/win32/vs9/builder.vcproj +++ b/build/win32/vs9/builder.vcproj @@ -1,153 +1,153 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="builder"
- ProjectGUID="{B7D32B02-3481-4A6E-8E0F-B43887F348A8}"
- RootNamespace="builder"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Sources"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File RelativePath="..\..\..\json-glib\tests\builder.c" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="builder" + ProjectGUID="{B7D32B02-3481-4A6E-8E0F-B43887F348A8}" + RootNamespace="builder" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\tests\builder.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/generator.vcproj b/build/win32/vs9/generator.vcproj index a7e6dc0..bd369bc 100644 --- a/build/win32/vs9/generator.vcproj +++ b/build/win32/vs9/generator.vcproj @@ -1,153 +1,153 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="generator"
- ProjectGUID="{E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}"
- RootNamespace="generator"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Sources"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File RelativePath="..\..\..\json-glib\tests\generator.c" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="generator" + ProjectGUID="{E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}" + RootNamespace="generator" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\tests\generator.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/gengir.vcproj b/build/win32/vs9/gengir.vcproj deleted file mode 100644 index a5cc540..0000000 --- a/build/win32/vs9/gengir.vcproj +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="gengir" - ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B15}" - RootNamespace="gengir" - Keyword="Win32Proj" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - InheritedPropertySheets=".\json-glib.vsprops" - OutputDirectory="$(GlibEtcInstallRoot)" - ConfigurationType="10" - CharacterSet="2" - DeleteExtensionsOnClean="" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(DoGenGir)" - /> - </Configuration> - <Configuration - Name="Debug|x64" - InheritedPropertySheets=".\json-glib.vsprops" - OutputDirectory="$(GlibEtcInstallRoot)" - ConfigurationType="10" - CharacterSet="2" - DeleteExtensionsOnClean="" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(DoGenGir)" - /> - </Configuration> - <Configuration - Name="Release|Win32" - InheritedPropertySheets=".\json-glib.vsprops" - OutputDirectory="$(GlibEtcInstallRoot)" - ConfigurationType="10" - CharacterSet="2" - WholeProgramOptimization="1" - DeleteExtensionsOnClean="" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(DoGenGir)" - /> - </Configuration> - <Configuration - Name="Release|x64" - InheritedPropertySheets=".\json-glib.vsprops" - OutputDirectory="$(GlibEtcInstallRoot)" - ConfigurationType="10" - CharacterSet="2" - WholeProgramOptimization="1" - DeleteExtensionsOnClean="" - > - <Tool - Name="VCPreBuildEventTool" - CommandLine="$(DoGenGir)" - /> - </Configuration> - </Configurations> -</VisualStudioProject> diff --git a/build/win32/vs9/gvariant.vcproj b/build/win32/vs9/gvariant.vcproj index abd76e4..4164a65 100644 --- a/build/win32/vs9/gvariant.vcproj +++ b/build/win32/vs9/gvariant.vcproj @@ -21,7 +21,7 @@ <Configurations> <Configuration Name="Debug|Win32" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" > @@ -49,7 +49,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" > @@ -75,7 +75,7 @@ </Configuration> <Configuration Name="Release|Win32" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" @@ -106,7 +106,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj index b79beb1..7edd513 100644 --- a/build/win32/vs9/install.vcproj +++ b/build/win32/vs9/install.vcproj @@ -1,83 +1,77 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="install"
- ProjectGUID="{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}"
- RootNamespace="install"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(GlibEtcInstallRoot)"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
- ConfigurationType="10"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="$(JsonGlibDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(GlibEtcInstallRoot)"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="10"
- CharacterSet="2"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="$(JsonGlibDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(GlibEtcInstallRoot)"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
- ConfigurationType="10"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="$(JsonGlibDoInstall)"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(GlibEtcInstallRoot)"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="10"
- CharacterSet="2"
- WholeProgramOptimization="1"
- DeleteExtensionsOnClean=""
- >
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="$(JsonGlibDoInstall)"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="install" + ProjectGUID="{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}" + RootNamespace="install" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="10" + InheritedPropertySheets=".\json-glib-install.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPostBuildEventTool" + CommandLine="$(JsonGlibDoInstall)" + /> + </Configuration> + <Configuration + Name="Debug|x64" + ConfigurationType="10" + InheritedPropertySheets=".\json-glib-install.vsprops" + CharacterSet="2" + DeleteExtensionsOnClean="" + > + <Tool + Name="VCPostBuildEventTool" + CommandLine="$(JsonGlibDoInstall)" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="10" + InheritedPropertySheets=".\json-glib-install.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPostBuildEventTool" + CommandLine="$(JsonGlibDoInstall)" + /> + </Configuration> + <Configuration + Name="Release|x64" + ConfigurationType="10" + InheritedPropertySheets=".\json-glib-install.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + DeleteExtensionsOnClean="" + > + <Tool + Name="VCPostBuildEventTool" + CommandLine="$(JsonGlibDoInstall)" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/invalid.vcproj b/build/win32/vs9/invalid.vcproj index 179f39b..7065cbe 100644 --- a/build/win32/vs9/invalid.vcproj +++ b/build/win32/vs9/invalid.vcproj @@ -1,153 +1,153 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="invalid"
- ProjectGUID="{04658465-64F9-4F06-B7A7-D40F6EDF26E4}"
- RootNamespace="invalid"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Sources"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File RelativePath="..\..\..\json-glib\tests\invalid.c" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="invalid" + ProjectGUID="{04658465-64F9-4F06-B7A7-D40F6EDF26E4}" + RootNamespace="invalid" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\tests\invalid.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/json-glib-build-defines.vsprops b/build/win32/vs9/json-glib-build-defines.vsprops new file mode 100644 index 0000000..3d2dbc0 --- /dev/null +++ b/build/win32/vs9/json-glib-build-defines.vsprops @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="jsonglibbuilddefinesprops" + OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin" + IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)" + InheritedPropertySheets=".\json-glib-version-paths.vsprops" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include" + PreprocessorDefinitions="HAVE_CONFIG_H" + ForcedIncludeFiles="msvc_recommended_pragmas.h" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gio-2.0.lib" + AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib" + /> + <UserMacro + Name="JsonGlibDefines" + Value="JSON_COMPILATION=1;G_LOG_DOMAIN=\"Json\";JSON_LOCALEDIR=\"/dummy\"" + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/json-glib-format.vcproj b/build/win32/vs9/json-glib-format.vcproj new file mode 100644 index 0000000..c2640ba --- /dev/null +++ b/build/win32/vs9/json-glib-format.vcproj @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="json-glib-format" + ProjectGUID="{FF640D73-9BCD-4B75-B63F-75175A3C9F69}" + RootNamespace="jsonglibformat" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG;$(JsonGlibDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="intl.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG;$(JsonGlibDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="intl.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="$(JsonGlibDefines)" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="intl.lib" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="$(JsonGlibDefines)" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="intl.lib" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\json-glib-format.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/json-glib-gen-srcs.vsprops b/build/win32/vs9/json-glib-gen-srcs.vsprops new file mode 100644 index 0000000..117026c --- /dev/null +++ b/build/win32/vs9/json-glib-gen-srcs.vsprops @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="jsonglibgensrcsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + > + <UserMacro + Name="CopyConfigH" + Value="copy ..\config.h.win32 ..\..\..\config.h" + /> + <UserMacro + Name="JsonGlibGenerateDef" + Value=" +echo EXPORTS >$(DefDir)\json-glib.def
 +cl /EP ..\..\..\json-glib\json-glib.symbols >>$(DefDir)\json-glib.def + " + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/json-glib-install.vsprops b/build/win32/vs9/json-glib-install.vsprops new file mode 100644 index 0000000..b643886 --- /dev/null +++ b/build/win32/vs9/json-glib-install.vsprops @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="jsonglibinstallprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + > + <UserMacro + Name="JsonGlibDoInstall" + Value=" +mkdir $(CopyDir)
 +mkdir $(CopyDir)\bin
 +mkdir $(CopyDir)\lib
 + +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.lib $(CopyDir)\lib
 + +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(JsonGlibDllPrefix)json-glib$(JsonGlibDllSuffix).dll $(CopyDir)\bin
 +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\json-glib-format.exe $(CopyDir)\bin
 +copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\json-glib-validate.exe $(CopyDir)\bin
 + +mkdir $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 + +copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 + +copy ..\..\..\json-glib\json-builder.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-generator.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-gobject.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-gvariant.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-path.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-parser.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-reader.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib
 +" + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/json-glib-validate.vcproj b/build/win32/vs9/json-glib-validate.vcproj new file mode 100644 index 0000000..1550deb --- /dev/null +++ b/build/win32/vs9/json-glib-validate.vcproj @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="json-glib-validate" + ProjectGUID="{FF640D73-9BCD-4B75-B63F-75175A3C9F68}" + RootNamespace="jsonglibvalidate" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG;$(JsonGlibDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="intl.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG;$(JsonGlibDefines)" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="intl.lib" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="$(JsonGlibDefines)" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="intl.lib" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="$(JsonGlibDefines)" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="intl.lib" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\json-glib-validate.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/json-glib-version-paths.vsprops b/build/win32/vs9/json-glib-version-paths.vsprops new file mode 100644 index 0000000..cade5f9 --- /dev/null +++ b/build/win32/vs9/json-glib-version-paths.vsprops @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="jsonglibversionpathsprops" + > + <UserMacro + Name="VSVer" + Value="9" + /> + <UserMacro + Name="GlibEtcInstallRoot" + Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)" + /> + <UserMacro + Name="CopyDir" + Value="$(GlibEtcInstallRoot)" + /> + <UserMacro + Name="DefDir" + Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)" + /> + <UserMacro + Name="ApiVersion" + Value="1.0" + /> + <UserMacro + Name="JsonGlibLibtoolCompatibleDllPrefix" + Value="lib" + /> + <UserMacro + Name="JsonGlibLibtoolCompatibleDllSuffix" + Value="-1.0-0" + /> + <UserMacro + Name="JsonGlibSeparateVSDllPrefix" + Value="" + /> + <UserMacro + Name="JsonGlibSeparateVSDllSuffix" + Value="-1-vs$(VSVer)" + /> + <!-- Change these two to JsonGlibLibtoolCompatibleDllPrefix and + JsonGlibLibtoolCompatibleDllSuffix if that is what you want --> + <UserMacro + Name="JsonGlibDllPrefix" + Value="$(JsonGlibSeparateVSDllPrefix)" + /> + <UserMacro + Name="JsonGlibDllSuffix" + Value="$(JsonGlibSeparateVSDllSuffix)" + /> +</VisualStudioPropertySheet> diff --git a/build/win32/vs9/json-glib.sln b/build/win32/vs9/json-glib.sln index b8e39ee..b12848f 100644 --- a/build/win32/vs9/json-glib.sln +++ b/build/win32/vs9/json-glib.sln @@ -1,6 +1,18 @@ 
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-glib", "json-glib.vcproj", "{469DB0A8-E33E-4112-A38C-52A168ECDC03}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-glib-validate", "json-glib-validate.vcproj", "{FF640D73-9BCD-4B75-B63F-75175A3C9F68}"
+ ProjectSection(ProjectDependencies) = postProject
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03} = {469DB0A8-E33E-4112-A38C-52A168ECDC03}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-glib-format", "json-glib-format.vcproj", "{FF640D73-9BCD-4B75-B63F-75175A3C9F69}"
+ ProjectSection(ProjectDependencies) = postProject
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03} = {469DB0A8-E33E-4112-A38C-52A168ECDC03}
+ EndProjectSection
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "array", "array.vcproj", "{9B2921C9-577F-418D-8341-6D79771DDCEC}"
ProjectSection(ProjectDependencies) = postProject
{469DB0A8-E33E-4112-A38C-52A168ECDC03} = {469DB0A8-E33E-4112-A38C-52A168ECDC03}
@@ -66,35 +78,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "path", "path.vcproj", "{FF6 {469DB0A8-E33E-4112-A38C-52A168ECDC03} = {469DB0A8-E33E-4112-A38C-52A168ECDC03}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-glib", "json-glib.vcproj", "{469DB0A8-E33E-4112-A38C-52A168ECDC03}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}"
- ProjectSection(ProjectDependencies) = postProject
- {B7D32B02-3481-4A6E-8E0F-B43887F348A8} = {B7D32B02-3481-4A6E-8E0F-B43887F348A8}
- {BDF81D39-F7E1-4B34-80E5-4B979E10629F} = {BDF81D39-F7E1-4B34-80E5-4B979E10629F}
- {C3FCC23B-54CC-4447-B9A7-CE095EA60B16} = {C3FCC23B-54CC-4447-B9A7-CE095EA60B16}
- {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D} = {E84F9D53-C9F7-4D7D-B8D0-AFE8BE3E7B7D}
- {04658465-64F9-4F06-B7A7-D40F6EDF26E3} = {04658465-64F9-4F06-B7A7-D40F6EDF26E3}
- {99FC597F-539A-49BB-9B9A-6C1EF802A17B} = {99FC597F-539A-49BB-9B9A-6C1EF802A17B}
- {5016D295-CC2F-4149-80C2-71D7A33791B2} = {5016D295-CC2F-4149-80C2-71D7A33791B2}
- {83A444A0-D80E-40E0-90CF-5876E1AA97DB} = {83A444A0-D80E-40E0-90CF-5876E1AA97DB}
- {469DB0A8-E33E-4112-A38C-52A168ECDC03} = {469DB0A8-E33E-4112-A38C-52A168ECDC03}
- {9B2921C9-577F-418D-8341-6D79771DDCEC} = {9B2921C9-577F-418D-8341-6D79771DDCEC}
- {980282CA-EAEA-4F33-8982-39DAF018978A} = {980282CA-EAEA-4F33-8982-39DAF018978A}
- {27AFA4CD-917A-4155-9F61-025094A97933} = {27AFA4CD-917A-4155-9F61-025094A97933}
- {AA52A332-735D-4177-8CA6-842018E60DED} = {AA52A332-735D-4177-8CA6-842018E60DED}
- {FF640D73-9BCD-4B75-B63F-75175A3C9F67} = {FF640D73-9BCD-4B75-B63F-75175A3C9F67}
- {04658465-64F9-4F06-B7A7-D40F6EDF26E4} = {04658465-64F9-4F06-B7A7-D40F6EDF26E4}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gengir", "gengir.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B15}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "invalid", "invalid.vcproj", "{04658465-64F9-4F06-B7A7-D40F6EDF26E4}"
ProjectSection(ProjectDependencies) = postProject
{469DB0A8-E33E-4112-A38C-52A168ECDC03} = {469DB0A8-E33E-4112-A38C-52A168ECDC03}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "invalid", "invalid.vcproj", "{04658465-64F9-4F06-B7A7-D40F6EDF26E4}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}"
ProjectSection(ProjectDependencies) = postProject
{469DB0A8-E33E-4112-A38C-52A168ECDC03} = {469DB0A8-E33E-4112-A38C-52A168ECDC03}
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68} = {FF640D73-9BCD-4B75-B63F-75175A3C9F68}
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69} = {FF640D73-9BCD-4B75-B63F-75175A3C9F69}
EndProjectSection
EndProject
Global
@@ -105,6 +98,30 @@ Global Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|Win32.ActiveCfg = Debug|Win32
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|Win32.Build.0 = Debug|Win32
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|x64.ActiveCfg = Debug|x64
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|x64.Build.0 = Debug|x64
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|Win32.ActiveCfg = Release|Win32
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|Win32.Build.0 = Release|Win32
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|x64.ActiveCfg = Release|x64
+ {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|x64.Build.0 = Release|x64
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Debug|Win32.Build.0 = Debug|Win32
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Debug|x64.ActiveCfg = Debug|x64
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Debug|x64.Build.0 = Debug|x64
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Release|Win32.ActiveCfg = Release|Win32
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Release|Win32.Build.0 = Release|Win32
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Release|x64.ActiveCfg = Release|x64
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F68}.Release|x64.Build.0 = Release|x64
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Debug|Win32.ActiveCfg = Debug|Win32
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Debug|Win32.Build.0 = Debug|Win32
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Debug|x64.ActiveCfg = Debug|x64
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Debug|x64.Build.0 = Debug|x64
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Release|Win32.ActiveCfg = Release|Win32
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Release|Win32.Build.0 = Release|Win32
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Release|x64.ActiveCfg = Release|x64
+ {FF640D73-9BCD-4B75-B63F-75175A3C9F69}.Release|x64.Build.0 = Release|x64
{9B2921C9-577F-418D-8341-6D79771DDCEC}.Debug|Win32.ActiveCfg = Debug|Win32
{9B2921C9-577F-418D-8341-6D79771DDCEC}.Debug|Win32.Build.0 = Debug|Win32
{9B2921C9-577F-418D-8341-6D79771DDCEC}.Debug|x64.ActiveCfg = Debug|x64
@@ -193,14 +210,6 @@ Global {5016D295-CC2F-4149-80C2-71D7A33791B2}.Release|Win32.Build.0 = Release|Win32
{5016D295-CC2F-4149-80C2-71D7A33791B2}.Release|x64.ActiveCfg = Release|x64
{5016D295-CC2F-4149-80C2-71D7A33791B2}.Release|x64.Build.0 = Release|x64
- {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|Win32.ActiveCfg = Debug|Win32
- {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|Win32.Build.0 = Debug|Win32
- {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|x64.ActiveCfg = Debug|x64
- {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Debug|x64.Build.0 = Debug|x64
- {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|Win32.ActiveCfg = Release|Win32
- {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|Win32.Build.0 = Release|Win32
- {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|x64.ActiveCfg = Release|x64
- {469DB0A8-E33E-4112-A38C-52A168ECDC03}.Release|x64.Build.0 = Release|x64
{AA52A332-735D-4177-8CA6-842018E60DED}.Debug|Win32.ActiveCfg = Debug|Win32
{AA52A332-735D-4177-8CA6-842018E60DED}.Debug|Win32.Build.0 = Debug|Win32
{AA52A332-735D-4177-8CA6-842018E60DED}.Debug|x64.ActiveCfg = Debug|x64
@@ -225,10 +234,6 @@ Global {41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|Win32.Build.0 = Release|Win32
{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|x64.ActiveCfg = Release|x64
{41ABBEB6-693A-4E63-9DD7-EAAC437BC173}.Release|x64.Build.0 = Release|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|Win32.ActiveCfg = Debug|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Debug|x64.ActiveCfg = Debug|x64
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|Win32.ActiveCfg = Release|Win32
- {2093D218-190E-4194-9421-3BA7CBF33B15}.Release|x64.ActiveCfg = Release|x64
{04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Debug|Win32.ActiveCfg = Debug|Win32
{04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Debug|Win32.Build.0 = Debug|Win32
{04658465-64F9-4F06-B7A7-D40F6EDF26E4}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/build/win32/vs9/json-glib.vsprops b/build/win32/vs9/json-glib.vsprops deleted file mode 100644 index 52dc104..0000000 --- a/build/win32/vs9/json-glib.vsprops +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="jsonglibprops"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
- IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\..\..;..\..\..\json-glib;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
- PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED"
- ForcedIncludeFiles="msvc_recommended_pragmas.h"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gio-2.0.lib"
- AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
- />
- <UserMacro
- Name="VSVer"
- Value="9"
- />
- <UserMacro
- Name="GlibEtcInstallRoot"
- Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
- />
- <UserMacro
- Name="CopyDir"
- Value="$(GlibEtcInstallRoot)"
- />
- <UserMacro
- Name="DefDir"
- Value="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
- />
- <UserMacro
- Name="PrepBuild"
- Value="
-if exist ..\..\..\config.h goto DONE_CONFIG_H

-copy ..\config.h.win32 ..\..\..\config.h

-:DONE_CONFIG_H

- "
- />
- <UserMacro
- Name="ApiVersion"
- Value="1.0"
- />
- <UserMacro
- Name="JsonGlibDoInstall"
- Value="
-mkdir $(CopyDir)

-mkdir $(CopyDir)\bin

-mkdir $(CopyDir)\lib

-
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.lib $(CopyDir)\lib

-
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(CopyDir)\bin

-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(CopyDir)\bin

-copy ..\..\..\json-glib\tests\stream-load.json $(CopyDir)\bin

-
-mkdir $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-
-copy ..\..\..\json-glib\json-enum-types.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-version.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-glib.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-
-copy ..\..\..\json-glib\json-builder.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-generator.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-gobject.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-gvariant.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-path.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-parser.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-reader.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-copy ..\..\..\json-glib\json-types.h $(CopyDir)\include\json-glib-$(ApiVersion)\json-glib

-"
- />
- <UserMacro
- Name="DoGenGir"
- Value="
-set VSVER=$(VSVer)

-set CONF=$(ConfigurationName)

-set PLAT=$(PlatformName)

-set BASEDIR=$(GlibEtcInstallRoot)

-
-cd ..

-call gengir_jsonglib.bat

-cd vs$(VSVer)

- "
- />
- <UserMacro
- Name="JsonGlibGenerateDef"
- Value="
-echo EXPORTS >$(DefDir)\json-glib.def

-cl /EP ..\..\..\json-glib\json-glib.symbols >>$(DefDir)\json-glib.def

- "
- />
- <UserMacro
- Name="JsonGlibDefines"
- Value="JSON_COMPILATION;G_LOG_DOMAIN=\"Json\""
- />
- <UserMacro
- Name="JsonGlibLibtoolCompatibleDllPrefix"
- Value="lib"
- />
- <UserMacro
- Name="JsonGlibLibtoolCompatibleDllSuffix"
- Value="-1.0-0"
- />
- <UserMacro
- Name="JsonGlibSeparateVSDllPrefix"
- Value=""
- />
- <UserMacro
- Name="JsonGlibSeparateVSDllSuffix"
- Value="-1-vs$(VSVer)"
- />
- <!-- Change these two to JsonGlibLibtoolCompatibleDllPrefix and
- JsonGlibLibtoolCompatibleDllSuffix if that is what you want -->
- <UserMacro
- Name="JsonGlibDllPrefix"
- Value="$(JsonGlibSeparateVSDllPrefix)"
- />
- <UserMacro
- Name="JsonGlibDllSuffix"
- Value="$(JsonGlibSeparateVSDllSuffix)"
- />
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/node.vcproj b/build/win32/vs9/node.vcproj index fcbda7a..2e9b538 100644 --- a/build/win32/vs9/node.vcproj +++ b/build/win32/vs9/node.vcproj @@ -1,153 +1,153 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="node"
- ProjectGUID="{04658465-64F9-4F06-B7A7-D40F6EDF26E3}"
- RootNamespace="node"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Sources"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File RelativePath="..\..\..\json-glib\tests\node.c" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="node" + ProjectGUID="{04658465-64F9-4F06-B7A7-D40F6EDF26E3}" + RootNamespace="node" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\tests\node.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/object.vcproj b/build/win32/vs9/object.vcproj index 51d89f0..7115902 100644 --- a/build/win32/vs9/object.vcproj +++ b/build/win32/vs9/object.vcproj @@ -1,151 +1,151 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="object"
- ProjectGUID="{83A444A0-D80E-40E0-90CF-5876E1AA97DB}"
- RootNamespace="object"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Sources"
- >
- <File RelativePath="..\..\..\json-glib\tests\object.c" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="object" + ProjectGUID="{83A444A0-D80E-40E0-90CF-5876E1AA97DB}" + RootNamespace="object" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + > + <File RelativePath="..\..\..\json-glib\tests\object.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/parser.vcproj b/build/win32/vs9/parser.vcproj index 40029aa..067b29c 100644 --- a/build/win32/vs9/parser.vcproj +++ b/build/win32/vs9/parser.vcproj @@ -1,162 +1,162 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="parser"
- ProjectGUID="{BDF81D39-F7E1-4B34-80E5-4B979E10629F}"
- RootNamespace="parser"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Sources"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File RelativePath="..\..\..\json-glib\tests\parser.c" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="parser" + ProjectGUID="{BDF81D39-F7E1-4B34-80E5-4B979E10629F}" + RootNamespace="parser" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\tests\parser.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/path.vcproj b/build/win32/vs9/path.vcproj index f3669c5..36e45b0 100644 --- a/build/win32/vs9/path.vcproj +++ b/build/win32/vs9/path.vcproj @@ -21,7 +21,7 @@ <Configurations> <Configuration Name="Debug|Win32" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" > @@ -49,7 +49,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" > @@ -75,7 +75,7 @@ </Configuration> <Configuration Name="Release|Win32" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" @@ -106,7 +106,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" diff --git a/build/win32/vs9/reader.vcproj b/build/win32/vs9/reader.vcproj index 126ed4e..5af2133 100644 --- a/build/win32/vs9/reader.vcproj +++ b/build/win32/vs9/reader.vcproj @@ -1,154 +1,154 @@ -<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="reader"
- ProjectGUID="{99FC597F-539A-49BB-9B9A-6C1EF802A17B}"
- RootNamespace="reader"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="4"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=" "
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions="_DEBUG"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="17"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="1"
- InheritedPropertySheets=".\json-glib.vsprops"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- CommandLine=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- ForcedIncludeFiles=""
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies=""
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- InheritedPropertySheets=".\json-glib.vsprops"
- ConfigurationType="1"
- CharacterSet="2"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions=""
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="17"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Sources"
- Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File RelativePath="..\..\..\json-glib\tests\reader.c" />
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="big5"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="reader" + ProjectGUID="{99FC597F-539A-49BB-9B9A-6C1EF802A17B}" + RootNamespace="reader" + Keyword="Win32Proj" + TargetFrameworkVersion="196613" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies=" " + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Debug|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="_DEBUG" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + </Configuration> + <Configuration + Name="Release|Win32" + ConfigurationType="1" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + ForcedIncludeFiles="" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + </Configuration> + <Configuration + Name="Release|x64" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCCLCompilerTool" + PreprocessorDefinitions="" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CompileAs="1" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="Sources" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File RelativePath="..\..\..\json-glib\tests\reader.c" /> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/build/win32/vs9/serialize-complex.vcproj b/build/win32/vs9/serialize-complex.vcproj index 2f81ce7..76c60d6 100644 --- a/build/win32/vs9/serialize-complex.vcproj +++ b/build/win32/vs9/serialize-complex.vcproj @@ -22,7 +22,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" CharacterSet="2" > <Tool @@ -51,7 +51,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" > @@ -78,7 +78,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > @@ -111,7 +111,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" diff --git a/build/win32/vs9/serialize-full.vcproj b/build/win32/vs9/serialize-full.vcproj index acedaa6..4f29fda 100644 --- a/build/win32/vs9/serialize-full.vcproj +++ b/build/win32/vs9/serialize-full.vcproj @@ -22,7 +22,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" CharacterSet="2" > <Tool @@ -51,7 +51,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" > @@ -78,7 +78,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > @@ -112,7 +112,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" diff --git a/build/win32/vs9/serialize-simple.vcproj b/build/win32/vs9/serialize-simple.vcproj index 4c7f1ef..0098c8e 100644 --- a/build/win32/vs9/serialize-simple.vcproj +++ b/build/win32/vs9/serialize-simple.vcproj @@ -22,7 +22,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="1" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" CharacterSet="2" > <Tool @@ -51,7 +51,7 @@ </Configuration> <Configuration Name="Debug|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" > @@ -78,7 +78,7 @@ <Configuration Name="Release|Win32" ConfigurationType="1" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" CharacterSet="2" WholeProgramOptimization="1" > @@ -111,7 +111,7 @@ </Configuration> <Configuration Name="Release|x64" - InheritedPropertySheets=".\json-glib.vsprops" + InheritedPropertySheets=".\json-glib-build-defines.vsprops" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1" |