Revert "Revert "Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_1...

[platform/upstream/atk.git] / build / win32 / vs9 / atk.vcprojin

diff --git a/build/win32/vs9/atk.vcprojin b/build/win32/vs9/atk.vcprojin
index 4089412..5d2a578 100644 (file)
--- a/build/win32/vs9/atk.vcprojin
+++ b/build/win32/vs9/atk.vcprojin
@@ -22,8 +22,8 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\atk.vsprops"
-                       CharacterSet="1"
+                       InheritedPropertySheets=".\atk-gen-src.vsprops"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -40,26 +40,21 @@
                                DebugInformationFormat="4"
                        />
                        <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(GenerateAtkDef)"
-                       />
-                       <Tool
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll"
                                LinkIncremental="2"
                                IgnoreDefaultLibraryNames=""
-                               ModuleDefinitionFile="..\..\..\atk\atk.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
-                               ImportLibrary="$(OutDir)\$(ProjectName)-$(AtkApiVersion).lib"
+                               ImportLibrary="$(OutDir)\$(ProjectName)-$(ApiVersion).lib"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\atk.vsprops"
-                       CharacterSet="1"
+                       InheritedPropertySheets=".\atk-gen-src.vsprops"
+                       CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
                        <Tool
@@ -77,26 +72,21 @@
                                DebugInformationFormat="3"
                        />
                        <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(GenerateAtkDef)"
-                       />
-                       <Tool
                                Name="VCLinkerTool"
                                OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
-                               ModuleDefinitionFile="..\..\..\atk\atk.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-                               ImportLibrary="$(OutDir)\$(ProjectName)-$(AtkApiVersion).lib"
+                               ImportLibrary="$(OutDir)\$(ProjectName)-$(ApiVersion).lib"
                                TargetMachine="1"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\atk.vsprops"
+                       InheritedPropertySheets=".\atk-gen-src.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -115,24 +105,19 @@
                                DebugInformationFormat="3"
                        />
                        <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(GenerateAtkDef)"
-                       />
-                       <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies=""
-                               OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)-$(AtkDllSuffix).dll"
+                               OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll"
                                LinkIncremental="2"
-                               ModuleDefinitionFile="..\..\..\atk\atk.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
-                               ImportLibrary="$(TargetDir)$(ProjectName)-$(AtkApiVersion).lib"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
                                TargetMachine="17"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\atk.vsprops"
+                       InheritedPropertySheets=".\atk-gen-src.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -148,20 +133,15 @@
                                DebugInformationFormat="3"
                        />
                        <Tool
-                               Name="VCPreLinkEventTool"
-                               CommandLine="$(GenerateAtkDef)"
-                       />
-                       <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies=""
-                               OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)-$(AtkDllSuffix).dll"
+                               OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll"
                                LinkIncremental="2"
-                               ModuleDefinitionFile="..\..\..\atk\atk.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-                               ImportLibrary="$(TargetDir)$(ProjectName)-$(AtkApiVersion).lib"
+                               ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
                                TargetMachine="17"
                        />
                </Configuration>
@@ -174,7 +154,7 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
-#include "libatk.sourcefiles"
+#include "atk.sourcefiles"
                </Filter>
                <Filter
                        Name="Headers"
@@ -187,6 +167,74 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
+                       <File RelativePath="..\..\..\config.h.win32">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File RelativePath="..\..\..\atk\atkmarshal.list">
+                               <FileConfiguration Name="Debug|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Generating Marshalling Sources..."
+                                               CommandLine="$(GenMarshalSrc)"
+                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|Win32">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Generating Marshalling Sources..."
+                                               CommandLine="$(GenMarshalSrc)"
+                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Debug|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Generating Marshalling Sources..."
+                                               CommandLine="$(GenMarshalSrc)"
+                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration Name="Release|x64">
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               Description="Generating Marshalling Sources..."
+                                               CommandLine="$(GenMarshalSrc)"
+                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+                                       />
+                               </FileConfiguration>
+                       </File>
                        <File RelativePath="..\..\..\atk\atk.rc" />
                </Filter>
        </Files>