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 8a9fbc5..5d2a578 100644 (file)
--- a/build/win32/vs9/atk.vcprojin
+++ b/build/win32/vs9/atk.vcprojin
@@ -22,7 +22,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\atk.vsprops"
+                       InheritedPropertySheets=".\atk-gen-src.vsprops"
                        CharacterSet="2"
                        >
                        <Tool
@@ -44,7 +44,6 @@
                                OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll"
                                LinkIncremental="2"
                                IgnoreDefaultLibraryNames=""
-                               ModuleDefinitionFile="$(IntDir)\atk.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                ImportLibrary="$(OutDir)\$(ProjectName)-$(ApiVersion).lib"
@@ -54,7 +53,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="2"
-                       InheritedPropertySheets=".\atk.vsprops"
+                       InheritedPropertySheets=".\atk-gen-src.vsprops"
                        CharacterSet="2"
                        WholeProgramOptimization="1"
                        >
@@ -77,7 +76,6 @@
                                OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
-                               ModuleDefinitionFile="$(IntDir)\atk.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
@@ -88,7 +86,7 @@
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       InheritedPropertySheets=".\atk.vsprops"
+                       InheritedPropertySheets=".\atk-gen-src.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -111,7 +109,6 @@
                                AdditionalDependencies=""
                                OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll"
                                LinkIncremental="2"
-                               ModuleDefinitionFile="$(IntDir)\atk.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
@@ -120,7 +117,7 @@
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       InheritedPropertySheets=".\atk.vsprops"
+                       InheritedPropertySheets=".\atk-gen-src.vsprops"
                        ConfigurationType="2"
                        CharacterSet="2"
                        >
@@ -140,7 +137,6 @@
                                AdditionalDependencies=""
                                OutputFile="$(OutDir)\$(AtkDllPrefix)$(ProjectName)$(AtkDllSuffix).dll"
                                LinkIncremental="2"
-                               ModuleDefinitionFile="$(IntDir)\atk.def"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                OptimizeReferences="2"
@@ -158,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"
@@ -171,71 +167,71 @@
                        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="..\..\..\atk\atkmarshal.list">
+                       <File RelativePath="..\..\..\config.h.win32">
                                <FileConfiguration Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating Marshalling Sources..."
-                                               CommandLine="$(GenMarshalSrc)"
-                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating Marshalling Sources..."
-                                               CommandLine="$(GenMarshalSrc)"
-                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating Marshalling Sources..."
-                                               CommandLine="$(GenMarshalSrc)"
-                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating Marshalling Sources..."
-                                               CommandLine="$(GenMarshalSrc)"
-                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
+                                               Description="Copying config.h from config.h.win32..."
+                                               CommandLine="$(GenConfigH)"
+                                               Outputs="..\..\..\config.h"
                                        />
                                </FileConfiguration>
                        </File>
-                       <File RelativePath="..\..\..\atk\atk.symbols">
+                       <File RelativePath="..\..\..\atk\atkmarshal.list">
                                <FileConfiguration Name="Debug|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating atk.def..."
-                                               CommandLine="$(GenerateAtkDef)"
-                                               Outputs="$(IntDir)\atk.def"
+                                               Description="Generating Marshalling Sources..."
+                                               CommandLine="$(GenMarshalSrc)"
+                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|Win32">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating atk.def..."
-                                               CommandLine="$(GenerateAtkDef)"
-                                               Outputs="$(IntDir)\atk.def"
+                                               Description="Generating Marshalling Sources..."
+                                               CommandLine="$(GenMarshalSrc)"
+                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Debug|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating atk.def..."
-                                               CommandLine="$(GenerateAtkDef)"
-                                               Outputs="$(IntDir)\atk.def"
+                                               Description="Generating Marshalling Sources..."
+                                               CommandLine="$(GenMarshalSrc)"
+                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
                                        />
                                </FileConfiguration>
                                <FileConfiguration Name="Release|x64">
                                        <Tool
                                                Name="VCCustomBuildTool"
-                                               Description="Generating atk.def..."
-                                               CommandLine="$(GenerateAtkDef)"
-                                               Outputs="$(IntDir)\atk.def"
+                                               Description="Generating Marshalling Sources..."
+                                               CommandLine="$(GenMarshalSrc)"
+                                               Outputs="..\..\..\atk\atkmarshal.h;..\..\..\atk\atkmarshal.c"
                                        />
                                </FileConfiguration>
                        </File>