diff --git a/build/win32/vs10/.gitignore b/build/win32/vs10/.gitignore index f05d12617..5eb97bfa6 100644 --- a/build/win32/vs10/.gitignore +++ b/build/win32/vs10/.gitignore @@ -4,3 +4,8 @@ glib.vcxproj glib.vcxproj.filters gobject.vcxproj gobject.vcxproj.filters +glib-compile-resources.vcxproj +glib-compile-resources.vcxproj.filters +glib-compile-schemas.vcxproj +glib-compile-schemas.vcxproj.filters +glib-install.props diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index c972c0320..15fbfee57 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -1,42 +1,58 @@ +GENERATED_ITEMS = \ + glib.vcxproj \ + glib.vcxproj.filters \ + gobject.vcxproj \ + gobject.vcxproj.filters \ + gio.vcxproj \ + gio.vcxproj.filters \ + glib-compile-schemas.vcxproj \ + glib-compile-schemas.vcxproj.filters \ + glib-compile-resources.vcxproj \ + glib-compile-resources.vcxproj.filters \ + glib-install.props + EXTRA_DIST = \ - README.txt \ - glib.sln \ - glib.vcxproj \ - glib.vcxproj.filters \ - glib.vcxprojin \ - glib.vcxproj.filtersin \ - glib-genmarshal.vcxproj \ - glib-genmarshal.vcxproj.filters \ - gspawn-win32-helper-console.vcxproj \ - gspawn-win32-helper-console.vcxproj.filters \ - gspawn-win32-helper.vcxproj \ - gspawn-win32-helper.vcxproj.filters \ - gmodule.vcxproj \ - gmodule.vcxproj.filters \ - gobject.vcxproj \ - gobject.vcxproj.filters \ - gobject.vcxprojin \ - gobject.vcxproj.filtersin \ - gthread.vcxproj \ - gthread.vcxproj.filters \ - gio.vcxproj \ - gio.vcxproj.filters \ - gio.vcxprojin \ - gio.vcxproj.filtersin \ - glib-compile-schemas.vcxproj \ - glib-compile-schemas.vcxproj.filters \ - gsettings.vcxproj \ - gsettings.vcxproj.filters \ - glib-compile-resources.vcxproj \ - glib-compile-resources.vcxproj.filters \ - gresource.vcxproj \ - gresource.vcxproj.filters \ - gio-querymodules.vcxproj \ - gio-querymodules.vcxproj.filters \ - gdbus.vcxproj \ - gdbus.vcxproj.filters \ - glib-install.vcxproj \ - glib-build-defines.props \ - glib-install.props \ + README.txt \ + glib.sln \ + glib.vcxprojin \ + glib.vcxproj.filtersin \ + glib-genmarshal.vcxproj \ + glib-genmarshal.vcxproj.filters \ + gspawn-win32-helper-console.vcxproj \ + gspawn-win32-helper-console.vcxproj.filters \ + gspawn-win32-helper.vcxproj \ + gspawn-win32-helper.vcxproj.filters \ + gmodule.vcxproj \ + gmodule.vcxproj.filters \ + gobject.vcxprojin \ + gobject.vcxproj.filtersin \ + gthread.vcxproj \ + gthread.vcxproj.filters \ + gio.vcxprojin \ + gio.vcxproj.filtersin \ + glib-compile-schemas.vcxprojin \ + glib-compile-schemas.vcxproj.filtersin \ + gsettings.vcxproj \ + gsettings.vcxproj.filters \ + glib-compile-resources.vcxprojin \ + glib-compile-resources.vcxproj.filtersin \ + gresource.vcxproj \ + gresource.vcxproj.filters \ + gio-querymodules.vcxproj \ + gio-querymodules.vcxproj.filters \ + gdbus.vcxproj \ + gdbus.vcxproj.filters \ + glib-install.vcxproj \ + glib-build-defines.props \ + glib-install.propsin \ glib-version-paths.props \ - glib-gen-srcs.props + glib-gen-srcs.props \ + $(GENERATED_ITEMS) + +glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin glib.vs10.headers gobject.vs10.headers gio.vs10.headers + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib-install.propsin >$@ + rm glib.vs10.headers + rm gobject.vs10.headers + rm gio.vs10.headers + +DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/build/win32/vs10/gio.vcxproj.filtersin index 155a4d962..6c1abecd2 100644 --- a/build/win32/vs10/gio.vcxproj.filtersin +++ b/build/win32/vs10/gio.vcxproj.filtersin @@ -15,7 +15,7 @@ -#include "libgio.vs10.sourcefiles.filters" +#include "gio.vs10.sourcefiles.filters" Resource Files @@ -25,4 +25,4 @@ Resource Files - \ No newline at end of file + diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin index da4904582..627a9af60 100644 --- a/build/win32/vs10/gio.vcxprojin +++ b/build/win32/vs10/gio.vcxprojin @@ -178,7 +178,7 @@ -#include "libgio.vs10.sourcefiles" +#include "gio.vs10.sourcefiles" @@ -216,4 +216,4 @@ - \ No newline at end of file + diff --git a/build/win32/vs10/glib-compile-resources.vcxproj.filtersin b/build/win32/vs10/glib-compile-resources.vcxproj.filtersin new file mode 100644 index 000000000..68e8a5d52 --- /dev/null +++ b/build/win32/vs10/glib-compile-resources.vcxproj.filtersin @@ -0,0 +1,12 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + +#include "glib-compile-resources.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/glib-compile-resources.vcxprojin b/build/win32/vs10/glib-compile-resources.vcxprojin new file mode 100644 index 000000000..e098347b6 --- /dev/null +++ b/build/win32/vs10/glib-compile-resources.vcxprojin @@ -0,0 +1,180 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B0CDEC7F-DCE1-4F7E-B8A4-A3009C18FB2A} + glibcompileresources + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories) + _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories) + _DEBUG;$(GioInBuildMacro);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories) + $(GioInBuildMacro);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + ..\..\..\gmodule;..\..\..\gio;%(AdditionalIncludeDirectories) + $(GioInBuildMacro);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + false + + + MachineX64 + + + +#include "glib-compile-resources.vs10.sourcefiles" + + + + {f3d1583c-5613-4809-bd98-7cc1c1276f92} + false + + + {12bca020-eabf-429e-876a-a476bc9c10c0} + false + + + {f172effc-e30f-4593-809e-db2024b1e753} + false + + + + + + diff --git a/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin b/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin new file mode 100644 index 000000000..645779daa --- /dev/null +++ b/build/win32/vs10/glib-compile-schemas.vcxproj.filtersin @@ -0,0 +1,12 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + +#include "glib-compile-schemas.vs10.sourcefiles.filters" + + diff --git a/build/win32/vs10/glib-compile-schemas.vcxprojin b/build/win32/vs10/glib-compile-schemas.vcxprojin new file mode 100644 index 000000000..fff97fb42 --- /dev/null +++ b/build/win32/vs10/glib-compile-schemas.vcxprojin @@ -0,0 +1,180 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {015D69D0-8B42-438A-ADAE-052AC036E065} + glibcompileschemas + Win32Proj + + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + Application + MultiByte + true + v100 + + + Application + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + ..\..\..\gmodule;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + Disabled + ..\..\..\gmodule;%(AdditionalIncludeDirectories) + DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + false + + + MachineX64 + + + + + MaxSpeed + true + ..\..\..\gmodule;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + ..\..\..\gmodule;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + + + true + Console + true + true + false + + + MachineX64 + + + +#include "glib-compile-schemas.vs10.sourcefiles" + + + + {12bca020-eabf-429e-876a-a476bc9c10c0} + false + + + {f172effc-e30f-4593-809e-db2024b1e753} + false + + + {f3d1583c-5613-4809-bd98-7cc1c1276f92} + false + + + + + + diff --git a/build/win32/vs10/glib-install.propsin b/build/win32/vs10/glib-install.propsin new file mode 100644 index 000000000..484675cdd --- /dev/null +++ b/build/win32/vs10/glib-install.propsin @@ -0,0 +1,102 @@ + + + + + + + $(SolutionDir)$(Configuration)\$(Platform)\bin + $(BinDir)\$(GlibDllPrefix)glib(GlibDllSuffix).dll;$(BinDir)\$(GlibDllPrefix)gthread(GlibDllSuffix).dll;$(BinDir)\$(GlibDllPrefix)gmodule(GlibDllSuffix).dll;$(BinDir)\$(GlibDllPrefix)gobject(GlibDllSuffix).dll;$(BinDir)\$(GlibDllPrefix)gio(GlibDllSuffix).dll + $(BinDir)\glib-genmarshal.exe;$(BinDir)\glib-compile-schemas.exe;$(BinDir)\gsettings.exe;$(BinDir)\glib-compile-resources.exe;$(BinDir)\gresource.exe;$(BinDir)\gio-querymodules.exe;$(BinDir)\gdbus.exe + $(BinDir)\gspawn-win32-helper.exe;$(BinDir)\gspawn-win32-helper-console.exe + $(BinDir)\gspawn-win64-helper.exe;$(BinDir)\gspawn-win64-helper-console.exe + +mkdir $(CopyDir) +mkdir $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)glib$(GlibDllSuffix).dll $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)glib$(GlibDllSuffix).pdb $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)gthread$(GlibDllSuffix).dll $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)gthread$(GlibDllSuffix).pdb $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)gmodule$(GlibDllSuffix).dll $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)gmodule$(GlibDllSuffix).pdb $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).dll $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)gobject$(GlibDllSuffix).pdb $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).dll $(CopyDir)\bin +copy $(BinDir)\$(GlibDllPrefix)gio$(GlibDllSuffix).pdb $(CopyDir)\bin +copy $(BinDir)\glib-genmarshal.exe $(CopyDir)\bin +copy $(BinDir)\glib-genmarshal.pdb $(CopyDir)\bin +copy $(BinDir)\gspawn-win*-helper*.exe $(CopyDir)\bin +copy $(BinDir)\gspawn-win*-helper*.pdb $(CopyDir)\bin +copy $(BinDir)\glib-compile-schemas.exe $(CopyDir)\bin +copy $(BinDir)\glib-compile-schemas.pdb $(CopyDir)\bin +copy $(BinDir)\gsettings.exe $(CopyDir)\bin +copy $(BinDir)\gsettings.pdb $(CopyDir)\bin +copy $(BinDir)\glib-compile-resources.exe $(CopyDir)\bin +copy $(BinDir)\glib-compile-resources.pdb $(CopyDir)\bin +copy $(BinDir)\gresource.exe $(CopyDir)\bin +copy $(BinDir)\gresource.pdb $(CopyDir)\bin +copy $(BinDir)\gio-querymodules.exe $(CopyDir)\bin +copy $(BinDir)\gio-querymodules.pdb $(CopyDir)\bin +copy $(BinDir)\gdbus.exe $(CopyDir)\bin +copy $(BinDir)\gdbus.pdb $(CopyDir)\bin +copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen + +if exist ..\..\..\gobject\glib-mkenums copy ..\..\..\gobject\glib-mkenums $(CopyDir)\bin + +mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated +copy ..\..\..\msvc_recommended_pragmas.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\..\glib\glib.h $(CopyDir)\include\glib-$(ApiVersion) +copy ..\..\..\glib\glib-object.h $(CopyDir)\include\glib-$(ApiVersion) +#include "glib.vs10.headers" + +copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) + +mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject +#include "gobject.vs10.headers" +copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject + +mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio +#include "gio.vs10.headers" + +mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\..\gio\gwin32inputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\..\gio\gwin32outputstream.h $(CopyDir)\include\gio-win32-$(ApiVersion)\gio + +mkdir $(CopyDir)\lib\glib-$(ApiVersion)\include +copy ..\..\..\glib\glibconfig.h $(CopyDir)\lib\glib-$(ApiVersion)\include +copy $(BinDir)\glib-$(ApiVersion).lib $(CopyDir)\lib +copy $(BinDir)\gthread-$(ApiVersion).lib $(CopyDir)\lib +copy $(BinDir)\gmodule-$(ApiVersion).lib $(CopyDir)\lib +copy $(BinDir)\gobject-$(ApiVersion).lib $(CopyDir)\lib +copy $(BinDir)\gio-$(ApiVersion).lib $(CopyDir)\lib + +mkdir $(CopyDir)\share\glib-$(ApiVersion)\schemas +copy ..\..\..\gio\gschema.dtd $(CopyDir)\share\glib-$(ApiVersion)\schemas + +mkdir $(CopyDir)\share\glib-$(ApiVersion)\codegen +copy ..\..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codegen + + + + <_PropertySheetDisplayName>glibinstallprops + + + + $(BinDir) + + + $(InstalledDlls) + + + $(InstalledBins) + + + $(InstalledWin32Bins) + + + $(InstalledX64Bins) + + + $(GlibDoInstall) + + + diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin index fc40dc98c..e5bcdc0d6 100644 --- a/build/win32/vs10/glib.vcxproj.filtersin +++ b/build/win32/vs10/glib.vcxproj.filtersin @@ -24,7 +24,7 @@ -#include "libglib.vs10.sourcefiles.filters" +#include "glib.vs10.sourcefiles.filters" Source Files @@ -116,4 +116,4 @@ Resource Files - \ No newline at end of file + diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin index 0aa9087fd..db5550a54 100644 --- a/build/win32/vs10/glib.vcxprojin +++ b/build/win32/vs10/glib.vcxprojin @@ -339,7 +339,7 @@ -#include "libglib.vs10.sourcefiles" +#include "glib.vs10.sourcefiles" diff --git a/build/win32/vs10/gobject.vcxproj.filtersin b/build/win32/vs10/gobject.vcxproj.filtersin index 7c7350aa3..31748029e 100644 --- a/build/win32/vs10/gobject.vcxproj.filtersin +++ b/build/win32/vs10/gobject.vcxproj.filtersin @@ -15,7 +15,7 @@ -#include "libgobject.vs10.sourcefiles.filters" +#include "gobject.vs10.sourcefiles.filters" Resource Files diff --git a/build/win32/vs10/gobject.vcxprojin b/build/win32/vs10/gobject.vcxprojin index 71f8a488b..a909f285a 100644 --- a/build/win32/vs10/gobject.vcxprojin +++ b/build/win32/vs10/gobject.vcxprojin @@ -177,7 +177,7 @@ -#include "libgobject.vs10.sourcefiles" +#include "gobject.vs10.sourcefiles" diff --git a/build/win32/vs9/.gitignore b/build/win32/vs9/.gitignore index 3c5cef60b..7653d607c 100644 --- a/build/win32/vs9/.gitignore +++ b/build/win32/vs9/.gitignore @@ -1,3 +1,6 @@ glib.vcproj gobject.vcproj gio.vcproj +glib-compile-resources.vcproj +glib-compile-schemas.vcproj +glib-install.vsprops diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index 98d797a9c..07cd432fc 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -1,25 +1,39 @@ +GENERATED_ITEMS = \ + glib.vcproj \ + gobject.vcproj \ + gio.vcproj \ + glib-compile-schemas.vcproj \ + glib-compile-resources.vcproj \ + glib-install.vsprops + EXTRA_DIST = \ - README.txt \ - glib.sln \ - glib.vcproj \ - glib.vcprojin \ - glib-genmarshal.vcproj \ - gspawn-win32-helper-console.vcproj \ - gspawn-win32-helper.vcproj \ - gmodule.vcproj \ - gobject.vcproj \ - gobject.vcprojin \ - gthread.vcproj \ - gio.vcproj \ - gio.vcprojin \ - glib-compile-schemas.vcproj \ - gsettings.vcproj \ - glib-compile-resources.vcproj \ - gresource.vcproj \ - gio-querymodules.vcproj \ - gdbus.vcproj \ + README.txt \ + glib.sln \ + glib.vcprojin \ + glib-genmarshal.vcproj \ + gspawn-win32-helper-console.vcproj \ + gspawn-win32-helper.vcproj \ + gmodule.vcproj \ + gobject.vcprojin \ + gthread.vcproj \ + gio.vcprojin \ + gsettings.vcproj \ + gresource.vcproj \ + gio-querymodules.vcproj \ + gdbus.vcproj \ + glib-compile-schemas.vcprojin \ + glib-compile-resources.vcprojin \ glib-install.vcproj \ glib-build-defines.vsprops \ - glib-install.vsprops \ glib-version-paths.vsprops \ - glib-gen-srcs.vsprops + glib-gen-srcs.vsprops \ + glib-install.vspropsin \ + $(GENERATED_ITEMS) + +glib-install.vsprops: $(top_srcdir)/build/win32/vs9/glib-install.vspropsin glib.headers gobject.headers gio.headers + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib-install.vspropsin >$@ + rm glib.headers + rm gobject.headers + rm gio.headers + +DISTCLEANFILES = $(GENERATED_ITEMS) diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin index bb4a85be2..db551e77e 100644 --- a/build/win32/vs9/gio.vcprojin +++ b/build/win32/vs9/gio.vcprojin @@ -155,7 +155,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "libgio.sourcefiles" +#include "gio.sourcefiles" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "glib-compile-resources.sourcefiles" + + + + + diff --git a/build/win32/vs9/glib-compile-schemas.vcprojin b/build/win32/vs9/glib-compile-schemas.vcprojin new file mode 100644 index 000000000..2a750959e --- /dev/null +++ b/build/win32/vs9/glib-compile-schemas.vcprojin @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "glib-compile-schemas.sourcefiles" + + + + + diff --git a/build/win32/vs9/glib-install.vspropsin b/build/win32/vs9/glib-install.vspropsin new file mode 100644 index 000000000..fb3f24088 --- /dev/null +++ b/build/win32/vs9/glib-install.vspropsin @@ -0,0 +1,76 @@ + + + + diff --git a/build/win32/vs9/glib.vcprojin b/build/win32/vs9/glib.vcprojin index 7013a0814..170d43e4d 100644 --- a/build/win32/vs9/glib.vcprojin +++ b/build/win32/vs9/glib.vcprojin @@ -280,7 +280,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "libglib.sourcefiles" +#include "glib.sourcefiles" diff --git a/build/win32/vs9/gobject.vcprojin b/build/win32/vs9/gobject.vcprojin index 92ca2aa73..531e44241 100644 --- a/build/win32/vs9/gobject.vcprojin +++ b/build/win32/vs9/gobject.vcprojin @@ -152,7 +152,7 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > -#include "libgobject.sourcefiles" +#include "gobject.sourcefiles" ' \ - ;; \ - esac; \ - done | sort -u >libgio.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gio.vcprojin >$@ - rm libgio.sourcefiles - -../build/win32/vs10/gio.vcxproj: $(top_srcdir)/build/win32/vs10/gio.vcxprojin - for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ - case $$F in \ - gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c|gnetworkmonitornm.c) ;; \ - *.c) echo ' ' \ - ;; \ - esac; \ - done | sort -u >libgio.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxprojin >$@ - rm libgio.vs10.sourcefiles - -../build/win32/vs10/gio.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin - for F in `echo $(libgio_2_0_la_SOURCES) $(win32_actual_sources) $(win32_more_sources_for_vcproj) | tr '/' '\\'`; do \ - case $$F in \ - gunix*.c|gdesktopappinfo.c|gnetworkmonitornetlink.c|gcontenttype.c|gnetworkmonitornm.c) ;; \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done | sort -u >libgio.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gio.vcxproj.filtersin >$@ - rm libgio.vs10.sourcefiles.filters - if HAVE_GLIB_RUNTIME_LIBDIR install-data-hook: mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR) diff --git a/glib/Makefile.am b/glib/Makefile.am index c46a24d70..2783b51da 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -448,48 +448,24 @@ glib.def: libglib-2.0.la glib-2.0.lib: libglib-2.0.la glib.def $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/glib.def -out:$@ -dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/glib.vcproj ../build/win32/vs10/glib.vcxproj ../build/win32/vs10/glib.vcxproj.filters +# ------ MSVC Project File Generation ------ +MSVCPROJS = glib + +glib_FILES = $(libglib_2_0_la_SOURCES) +glib_EXCLUDES = *-unix.c|gthread-*.c + +glib_HEADERS_DIR = $(glibsubincludedir) +glib_HEADERS_INST = $(deprecatedinclude_HEADERS) $(glibsubinclude_HEADERS) +glib_HEADERS_EXCLUDES = dummy + +include $(top_srcdir)/build/Makefile.msvcproj + +dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/glib.vcproj $(top_builddir)/build/win32/vs9/glib.headers files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ cp $$d/$$f $(distdir) || exit 1; done -../build/win32/vs9/glib.vcproj: $(top_srcdir)/build/win32/vs9/glib.vcprojin - for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \ - case $$F in \ - *-unix.c|gthread-*.c) \ - ;; \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libglib.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/glib.vcprojin >$@ - rm libglib.sourcefiles - -../build/win32/vs10/glib.vcxproj: $(top_srcdir)/build/win32/vs10/glib.vcxprojin - for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \ - case $$F in \ - *-unix.c|gthread-*.c) \ - ;; \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libglib.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxprojin >$@ - rm libglib.vs10.sourcefiles - -../build/win32/vs10/glib.vcxproj.filters: $(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin - for F in `echo $(libglib_2_0_la_SOURCES) | tr '/' '\\'`; do \ - case $$F in \ - *-unix.c|gthread-*.c) \ - ;; \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done >libglib.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/glib.vcxproj.filtersin >$@ - rm libglib.vs10.sourcefiles.filters - # install gdb scripts gdbdir = $(datadir)/glib-2.0/gdb dist_gdb_SCRIPTS = glib.py diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 72ad2cd71..2108caa9c 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -224,42 +224,24 @@ gobject.def: libgobject-2.0.la gobject-2.0.lib: libgobject-2.0.la gobject.def $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgobject-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gobject.def -out:$@ -dist-hook: $(BUILT_EXTRA_DIST) ../build/win32/vs9/gobject.vcproj ../build/win32/vs10/gobject.vcxproj ../build/win32/vs10/gobject.vcxproj.filters +# ------ MSVC Project File Generation ------ +MSVCPROJS = gobject + +gobject_FILES = $(libgobject_2_0_la_SOURCES) +gobject_EXCLUDES = dummy + +gobject_HEADERS_DIR = $(libgobjectincludedir) +gobject_HEADERS_INST = $(gobject_public_h_sources) +gobject_HEADERS_EXCLUDES = dummy + +include $(top_srcdir)/build/Makefile.msvcproj + +dist-hook: $(BUILT_EXTRA_DIST) $(top_builddir)/build/win32/vs9/gobject.vcproj $(top_builddir)/build/win32/vs9/gobject.headers files='$(BUILT_EXTRA_DIST)'; \ for f in $$files; do \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ cp $$d/$$f $(distdir) || exit 1; done -../build/win32/vs9/gobject.vcproj: $(top_srcdir)/build/win32/vs9/gobject.vcprojin - for F in $(libgobject_2_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libgobject.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gobject.vcprojin >$@ - rm libgobject.sourcefiles - -../build/win32/vs10/gobject.vcxproj: $(top_srcdir)/build/win32/vs10/gobject.vcxprojin - for F in $(libgobject_2_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' ' \ - ;; \ - esac; \ - done >libgobject.vs10.sourcefiles - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gobject.vcxprojin >$@ - rm libgobject.vs10.sourcefiles - -../build/win32/vs10/gobject.vcxproj.filters: $(top_srcdir)/build/win32/vs10/gobject.vcxproj.filtersin - for F in $(libgobject_2_0_la_SOURCES); do \ - case $$F in \ - *.c) echo ' Source Files' \ - ;; \ - esac; \ - done >libgobject.vs10.sourcefiles.filters - $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gobject.vcxproj.filtersin >$@ - rm libgobject.vs10.sourcefiles.filters - install-data-local: install-ms-lib uninstall-local: uninstall-ms-lib uninstall-gdb