From 9b217a0d98d036fb0cbf862eefff9a8214ce5d85 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 28 May 2013 15:08:16 +0800 Subject: [PATCH] Update Visual Studio Build Files -Update the pre-configured config.h.win32(.in) to define _GDK_EXTERN as __declspec (dllexport) as we are not using .def files to export symbols anymore. -Update the GDK/GTK DLL projects and the property sheets to stop using the .symbols/.def files -Update the property sheets to "install" the newly-introduced GTK headers -Update the gtk3-demo project to build the new demo sources that must be built --- build/win32/vs10/gdk.vcxprojin | 21 +--------- build/win32/vs10/gtk+.props | 12 +++++- build/win32/vs10/gtk.vcxprojin | 22 +--------- build/win32/vs10/gtk3-demo.vcxproj | 3 ++ build/win32/vs10/gtk3-demo.vcxproj.filters | 9 ++++ build/win32/vs9/gdk.vcprojin | 48 ---------------------- build/win32/vs9/gtk+.vsprops | 13 +++--- build/win32/vs9/gtk.vcprojin | 48 ---------------------- build/win32/vs9/gtk3-demo.vcproj | 3 ++ config.h.win32.in | 3 ++ 10 files changed, 35 insertions(+), 147 deletions(-) diff --git a/build/win32/vs10/gdk.vcxprojin b/build/win32/vs10/gdk.vcxprojin index a82d966217..12131c408a 100644 --- a/build/win32/vs10/gdk.vcxprojin +++ b/build/win32/vs10/gdk.vcxprojin @@ -88,7 +88,6 @@ imm32.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(IntDir)gdk.def true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib @@ -108,7 +107,6 @@ imm32.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(IntDir)gdk.def true Windows true @@ -133,7 +131,6 @@ imm32.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(IntDir)gdk.def true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib @@ -153,7 +150,6 @@ imm32.lib;winmm.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(IntDir)gdk.def true Windows true @@ -162,21 +158,6 @@ MachineX64 - - - Generating gdk.def - $(GtkGenerateGdkDef) - $(IntDir)gdk.def;%(Outputs) - Generating gdk.def - $(GtkGenerateGdkDef) - $(IntDir)gdk.def;%(Outputs) - Generating gdk.def - $(GtkGenerateGdkDef) - $(IntDir)gdk.def;%(Outputs) - Generating gdk.def - $(GtkGenerateGdkDef) - $(IntDir)gdk.def;%(Outputs) - @@ -194,4 +175,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gtk+.props b/build/win32/vs10/gtk+.props index 31b59a2355..a34ef984ea 100644 --- a/build/win32/vs10/gtk+.props +++ b/build/win32/vs10/gtk+.props @@ -282,6 +282,8 @@ copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk +copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk + copy ..\..\..\gtk\gtkiconfactory.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk @@ -356,6 +358,8 @@ copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk +copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk + copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk @@ -396,6 +400,8 @@ copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk +copy ..\..\..\gtk\gtkrevealer.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk + copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk @@ -430,6 +436,10 @@ copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk +copy ..\..\..\gtk\gtkstack.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk + +copy ..\..\..\gtk\gtkstackswitcher.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk + copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk copy ..\..\..\gtk\gtkstatusicon.h $(CopyDir)\include\gtk-$(ApiVersion)\gtk @@ -708,8 +718,6 @@ call gengir_gtk.bat cd vs$(VSVer) - echo EXPORTS >"$(DefDir)\gdk.def" && cl /EP -DGDK_WINDOWING_WIN32 -DALL_FILES -DG_GNUC_CONST= ..\..\..\gdk\gdk.symbols >>"$(DefDir)\gdk.def" - echo EXPORTS >"$(DefDir)\gtk.def" && cl /EP -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES -DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_PRINTF=;G_GNUC_PRINTF ..\..\..\gtk\gtk.symbols >>"$(DefDir)\gtk.def" lib -$(ApiVersion)-0 diff --git a/build/win32/vs10/gtk.vcxprojin b/build/win32/vs10/gtk.vcxprojin index da2a4a55ef..333fb6a42d 100644 --- a/build/win32/vs10/gtk.vcxprojin +++ b/build/win32/vs10/gtk.vcxprojin @@ -88,7 +88,6 @@ atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(IntDir)gtk.def true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib @@ -108,7 +107,6 @@ atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(IntDir)gtk.def true Windows true @@ -133,7 +131,6 @@ atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(IntDir)gtk.def true Windows $(TargetDir)$(ProjectName)-$(ApiVersion).lib @@ -153,7 +150,6 @@ atk-1.0.lib;pangowin32-1.0.lib;imm32.lib;winspool.lib;comctl32.lib;%(AdditionalDependencies) $(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll - $(IntDir)gtk.def true Windows true @@ -162,22 +158,6 @@ MachineX64 - - - Generating gtk.def - $(GtkGenerateGtkDef) - $(IntDir)gtk.def;%(Outputs) - Generating gtk.def - $(GtkGenerateGtkDef) - $(IntDir)gtk.def;%(Outputs) - Generating gtk.def - $(GtkGenerateGtkDef) - $(IntDir)gtk.def;%(Outputs) - Generating gtk.def - $(GtkGenerateGtkDef) - $(IntDir)gtk.def;%(Outputs) - - @@ -212,4 +192,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/gtk3-demo.vcxproj b/build/win32/vs10/gtk3-demo.vcxproj index f316225eee..8c3f4dfb83 100644 --- a/build/win32/vs10/gtk3-demo.vcxproj +++ b/build/win32/vs10/gtk3-demo.vcxproj @@ -206,10 +206,13 @@ + + + diff --git a/build/win32/vs10/gtk3-demo.vcxproj.filters b/build/win32/vs10/gtk3-demo.vcxproj.filters index e3ca1c0779..07d6e06c38 100644 --- a/build/win32/vs10/gtk3-demo.vcxproj.filters +++ b/build/win32/vs10/gtk3-demo.vcxproj.filters @@ -122,18 +122,27 @@ Source Files + + Source Files + Source Files Source Files + + Source Files + Source Files Source Files + + Source Files + Source Files diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin index a6c20ecf63..7a539962b1 100644 --- a/build/win32/vs9/gdk.vcprojin +++ b/build/win32/vs9/gdk.vcprojin @@ -45,7 +45,6 @@ AdditionalDependencies="imm32.lib winmm.lib" OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gdk.def" GenerateDebugInformation="true" SubSystem="2" ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" @@ -76,7 +75,6 @@ AdditionalDependencies="imm32.lib winmm.lib" OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gdk.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -111,7 +109,6 @@ AdditionalDependencies="imm32.lib winmm.lib" OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gdk.def" GenerateDebugInformation="true" SubSystem="2" ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib" @@ -142,7 +139,6 @@ AdditionalDependencies="imm32.lib winmm.lib" OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll" LinkIncremental="1" - ModuleDefinitionFile="$(IntDir)\gdk.def" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" @@ -166,50 +162,6 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/config.h.win32.in b/config.h.win32.in index ddb9d75a83..273a9766c1 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -293,6 +293,9 @@ /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ +/* defines how to decorate public symbols while building */ +#define _GDK_EXTERN __declspec (dllexport) + /* Define for large files, on AIX-style hosts. */ /* #undef _LARGE_FILES */