diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am index c2548120d..e71be5daf 100644 --- a/build/win32/vs10/Makefile.am +++ b/build/win32/vs10/Makefile.am @@ -41,4 +41,4 @@ EXTRA_DIST = \ glib-build-defines.props \ glib-install.props \ glib-version-paths.props \ - glibprepbuild.props + glib-gen-srcs.props diff --git a/build/win32/vs10/gio.vcxproj.filtersin b/build/win32/vs10/gio.vcxproj.filtersin index 02a7ccf81..155a4d962 100644 --- a/build/win32/vs10/gio.vcxproj.filtersin +++ b/build/win32/vs10/gio.vcxproj.filtersin @@ -17,6 +17,9 @@ #include "libgio.vs10.sourcefiles.filters" + + Resource Files + Resource Files diff --git a/build/win32/vs10/gio.vcxprojin b/build/win32/vs10/gio.vcxprojin index 86faab3f1..5a968e519 100644 --- a/build/win32/vs10/gio.vcxprojin +++ b/build/win32/vs10/gio.vcxprojin @@ -50,19 +50,19 @@ - + - + - + - + @@ -176,6 +176,22 @@ #include "libgio.vs10.sourcefiles" + + + Copying gnetworking.h from gnetworking.h.win32... + $(GenGNetworkingH) + ..\..\..\gio\gnetworking.h;%(Outputs) + Copying gnetworking.h from gnetworking.h.win32... + $(GenGNetworkingH) + ..\..\..\gio\gnetworking.h;%(Outputs) + Copying gnetworking.h from gnetworking.h.win32... + $(GenGNetworkingH) + ..\..\..\gio\gnetworking.h;%(Outputs) + Copying gnetworking.h from gnetworking.h.win32... + $(GenGNetworkingH) + ..\..\..\gio\gnetworking.h;%(Outputs) + + diff --git a/build/win32/vs10/glib-build-defines.props b/build/win32/vs10/glib-build-defines.props index d67244bc3..83ecd8b04 100644 --- a/build/win32/vs10/glib-build-defines.props +++ b/build/win32/vs10/glib-build-defines.props @@ -67,4 +67,4 @@ $(WindowsNetworkingLibs) - + \ No newline at end of file diff --git a/build/win32/vs10/glib-gen-srcs.props b/build/win32/vs10/glib-gen-srcs.props new file mode 100644 index 000000000..c79b21503 --- /dev/null +++ b/build/win32/vs10/glib-gen-srcs.props @@ -0,0 +1,29 @@ + + + + + + + copy ..\..\..\config.h.win32 ..\..\..\config.h + copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h + copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h + copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h + + + <_PropertySheetDisplayName>glibgensrcsprops + + + + $(GenConfigH) + + + $(GenGLibConfigH) + + + $(GenGModuleConfH) + + + $(GenGNetworkingH) + + + \ No newline at end of file diff --git a/build/win32/vs10/glib-install.props b/build/win32/vs10/glib-install.props index 8daf5d249..0a550525b 100644 --- a/build/win32/vs10/glib-install.props +++ b/build/win32/vs10/glib-install.props @@ -1,7 +1,7 @@  - + @@ -30,15 +30,24 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\gdbus.exe $(CopyDir)\bin copy ..\..\..\gio\gdbus-2.0\codegen\gdbus-codegen.in $(CopyDir)\bin\gdbus-codegen -mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib +mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated + +mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject + +mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio + +mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio + 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) +copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) + + copy ..\..\..\glib\galloca.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\garray.h $(CopyDir)\include\glib-$(ApiVersion)\glib @@ -87,10 +96,10 @@ copy ..\..\..\glib\ghook.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\ghostutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib -copy ..\..\..\glib\gi18n-lib.h $(CopyDir)\include\glib-$(ApiVersion)\glib - copy ..\..\..\glib\gi18n.h $(CopyDir)\include\glib-$(ApiVersion)\glib +copy ..\..\..\glib\gi18n-lib.h $(CopyDir)\include\glib-$(ApiVersion)\glib + copy ..\..\..\glib\giochannel.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\gkeyfile.h $(CopyDir)\include\glib-$(ApiVersion)\glib @@ -119,8 +128,6 @@ copy ..\..\..\glib\gpoll.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\gprimes.h $(CopyDir)\include\glib-$(ApiVersion)\glib -copy ..\..\..\glib\gprintf.h $(CopyDir)\include\glib-$(ApiVersion)\glib - copy ..\..\..\glib\gqsort.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\gquark.h $(CopyDir)\include\glib-$(ApiVersion)\glib @@ -145,13 +152,13 @@ copy ..\..\..\glib\gspawn.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\gstdio.h $(CopyDir)\include\glib-$(ApiVersion)\glib -copy ..\..\..\glib\gstringchunk.h $(CopyDir)\include\glib-$(ApiVersion)\glib - copy ..\..\..\glib\gstrfuncs.h $(CopyDir)\include\glib-$(ApiVersion)\glib +copy ..\..\..\glib\gtestutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib + copy ..\..\..\glib\gstring.h $(CopyDir)\include\glib-$(ApiVersion)\glib -copy ..\..\..\glib\gtestutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib +copy ..\..\..\glib\gstringchunk.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\gthread.h $(CopyDir)\include\glib-$(ApiVersion)\glib @@ -173,18 +180,17 @@ copy ..\..\..\glib\gurifuncs.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\gutils.h $(CopyDir)\include\glib-$(ApiVersion)\glib -copy ..\..\..\glib\gvariant.h $(CopyDir)\include\glib-$(ApiVersion)\glib - copy ..\..\..\glib\gvarianttype.h $(CopyDir)\include\glib-$(ApiVersion)\glib +copy ..\..\..\glib\gvariant.h $(CopyDir)\include\glib-$(ApiVersion)\glib + copy ..\..\..\glib\gversion.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\gversionmacros.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\gwin32.h $(CopyDir)\include\glib-$(ApiVersion)\glib - -mkdir $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated +copy ..\..\..\glib\gprintf.h $(CopyDir)\include\glib-$(ApiVersion)\glib copy ..\..\..\glib\deprecated\gallocator.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated @@ -198,11 +204,7 @@ copy ..\..\..\glib\deprecated\grel.h $(CopyDir)\include\glib-$(ApiVersion)\glib\ copy ..\..\..\glib\deprecated\gthread.h $(CopyDir)\include\glib-$(ApiVersion)\glib\deprecated - -copy ..\..\..\gmodule\gmodule.h $(CopyDir)\include\glib-$(ApiVersion) - - -mkdir $(CopyDir)\include\glib-$(ApiVersion)\gobject +copy ..\..\..\gobject\glib-types.h $(CopyDir)\include\glib-$(ApiVersion)\gobject copy ..\..\..\gobject\gbinding.h $(CopyDir)\include\glib-$(ApiVersion)\gobject @@ -212,14 +214,10 @@ copy ..\..\..\gobject\gclosure.h $(CopyDir)\include\glib-$(ApiVersion)\gobject copy ..\..\..\gobject\genums.h $(CopyDir)\include\glib-$(ApiVersion)\gobject -copy ..\..\..\gobject\glib-types.h $(CopyDir)\include\glib-$(ApiVersion)\gobject - copy ..\..\..\gobject\gmarshal.h $(CopyDir)\include\glib-$(ApiVersion)\gobject copy ..\..\..\gobject\gobject.h $(CopyDir)\include\glib-$(ApiVersion)\gobject -copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject - copy ..\..\..\gobject\gparam.h $(CopyDir)\include\glib-$(ApiVersion)\gobject copy ..\..\..\gobject\gparamspecs.h $(CopyDir)\include\glib-$(ApiVersion)\gobject @@ -242,23 +240,10 @@ copy ..\..\..\gobject\gvaluecollector.h $(CopyDir)\include\glib-$(ApiVersion)\go copy ..\..\..\gobject\gvaluetypes.h $(CopyDir)\include\glib-$(ApiVersion)\gobject - -mkdir $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gactiongroupexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gactionmap.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gobject\gobjectnotifyqueue.c $(CopyDir)\include\glib-$(ApiVersion)\gobject copy ..\..\..\gio\gappinfo.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gapplication.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gapplicationcommandline.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gasyncinitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gasyncresult.h $(CopyDir)\include\glib-$(ApiVersion)\gio @@ -271,66 +256,20 @@ copy ..\..\..\gio\gbytesicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gcancellable.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gcharsetconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gcontenttype.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gcharsetconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio + copy ..\..\..\gio\gconverter.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gconverterinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gconverteroutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gcredentials.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gdatainputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gdataoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gdbusactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusauthobserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbuserror.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusinterface.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusinterfaceskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusmessage.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusnameowning.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusnamewatching.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusobject.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusobjectmanager.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusobjectmanagerclient.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusobjectmanagerserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusobjectproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusobjectskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusintrospection.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusmethodinvocation.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gdbusserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gdrive.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gemblem.h $(CopyDir)\include\glib-$(ApiVersion)\gio @@ -349,35 +288,35 @@ copy ..\..\..\gio\gfileinfo.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gfileinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gfileiostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gfilemonitor.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gfilenamecompleter.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gfileoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gfileiostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio + copy ..\..\..\gio\gfilterinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gfilteroutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\ginetaddressmask.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\ginetaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\ginetaddressmask.h $(CopyDir)\include\glib-$(ApiVersion)\gio + copy ..\..\..\gio\ginetsocketaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\ginitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\ginputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\ginitable.h $(CopyDir)\include\glib-$(ApiVersion)\gio + copy ..\..\..\gio\gio.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gioenums.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\giotypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gioenumtypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gioenums.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gioerror.h $(CopyDir)\include\glib-$(ApiVersion)\gio @@ -387,22 +326,14 @@ copy ..\..\..\gio\gioscheduler.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\giostream.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\giotypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gloadableicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gmount.h $(CopyDir)\include\glib-$(ApiVersion)\gio + copy ..\..\..\gio\gmemoryinputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gmemoryoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gmenuexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gmenu.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gmount.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gmountoperation.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gnativevolumemonitor.h $(CopyDir)\include\glib-$(ApiVersion)\gio @@ -423,38 +354,24 @@ copy ..\..\..\gio\gpollableoutputstream.h $(CopyDir)\include\glib-$(ApiVersion)\ copy ..\..\..\gio\gpollableutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gpropertyaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gproxyaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gproxyaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gproxyaddressenumerator.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gremoteactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gresource.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gseekable.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gsettingsschema.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gsettings.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gsimpleasyncresult.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gsimpleaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio - -copy ..\..\..\gio\gsimpleactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gsimplepermission.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gsimpleproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gsocket.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gsocketaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio @@ -475,18 +392,22 @@ copy ..\..\..\gio\gsocketservice.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gsrvtarget.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gsimpleproxyresolver.h $(CopyDir)\include\glib-$(ApiVersion)\gio + copy ..\..\..\gio\gtask.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gsubprocess.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gsubprocesslauncher.h $(CopyDir)\include\glib-$(ApiVersion)\gio + copy ..\..\..\gio\gtcpconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gtcpwrapperconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gtestdbus.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gthreadedsocketservice.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gthemedicon.h $(CopyDir)\include\glib-$(ApiVersion)\gio -copy ..\..\..\gio\gthreadedsocketservice.h $(CopyDir)\include\glib-$(ApiVersion)\gio - copy ..\..\..\gio\gtlsbackend.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gtlscertificate.h $(CopyDir)\include\glib-$(ApiVersion)\gio @@ -515,14 +436,98 @@ copy ..\..\..\gio\gzlibcompressor.h $(CopyDir)\include\glib-$(ApiVersion)\gio copy ..\..\..\gio\gzlibdecompressor.h $(CopyDir)\include\glib-$(ApiVersion)\gio +copy ..\..\..\gio\gapplication.h $(CopyDir)\include\glib-$(ApiVersion)\gio -mkdir $(CopyDir)\include\gio-win32-$(ApiVersion)\gio +copy ..\..\..\gio\gapplicationcommandline.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gactionmap.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gsimpleactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gremoteactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gactiongroupexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusactiongroup.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gpropertyaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gsimpleaction.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gmenu.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gmenuexporter.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusmenumodel.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gnotification.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gsettingsbackend.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gsettingsschema.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gsettings.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusauthobserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gcredentials.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusutils.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbuserror.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusaddress.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusconnection.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusmessage.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusnameowning.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusnamewatching.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusintrospection.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusmethodinvocation.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusinterface.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusinterfaceskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusobject.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusobjectskeleton.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusobjectproxy.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusobjectmanager.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusobjectmanagerclient.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gdbusobjectmanagerserver.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gtestdbus.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gioenumtypes.h $(CopyDir)\include\glib-$(ApiVersion)\gio + +copy ..\..\..\gio\gnetworking.h $(CopyDir)\include\glib-$(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 diff --git a/build/win32/vs10/glib-version-paths.props b/build/win32/vs10/glib-version-paths.props index f43c6322e..d81982846 100644 --- a/build/win32/vs10/glib-version-paths.props +++ b/build/win32/vs10/glib-version-paths.props @@ -47,4 +47,4 @@ $(GlibDllSuffix) - + \ No newline at end of file diff --git a/build/win32/vs10/glib.vcxproj.filtersin b/build/win32/vs10/glib.vcxproj.filtersin index 8262d2f52..fc40dc98c 100644 --- a/build/win32/vs10/glib.vcxproj.filtersin +++ b/build/win32/vs10/glib.vcxproj.filtersin @@ -107,6 +107,10 @@ Source Files\pcre + + Resource Files + Resource Files + Resource Files diff --git a/build/win32/vs10/glib.vcxprojin b/build/win32/vs10/glib.vcxprojin index d76f1fa83..3fd8e43d9 100644 --- a/build/win32/vs10/glib.vcxprojin +++ b/build/win32/vs10/glib.vcxprojin @@ -89,43 +89,35 @@ - - + - - + - - + - - + - - + - - + - - + - - + @@ -530,6 +522,60 @@ true + + + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) + + + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\..\glib\glibconfig.h;%(Outputs) + Copying glibconfig.h from glibconfig.h.win32... + $(GenGLibConfigH) + ..\..\..\glib\glibconfig.h;%(Outputs) + + diff --git a/build/win32/vs10/glibprepbuild.props b/build/win32/vs10/glibprepbuild.props deleted file mode 100644 index 81b450bab..000000000 --- a/build/win32/vs10/glibprepbuild.props +++ /dev/null @@ -1,39 +0,0 @@ - - - - <_PropertySheetDisplayName>glibprepbuildprops - - - - -if exist ..\..\..\config.h goto DONE_CONFIG_H - -copy ..\..\..\config.h.win32 ..\..\..\config.h - -:DONE_CONFIG_H - - -if exist ..\..\..\glib\glibconfig.h goto DONE_GLIBCONFIG_H - -copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h - -:DONE_GLIBCONFIG_H - - -if exist ..\..\..\gmodule\gmoduleconf.h goto DONE_GMODULECONF_H - -copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h - -:DONE_GMODULECONF_H - - -if exist ..\..\..\gio\gnetworking.h goto DONE_GNETWORKING_H - -copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h - -:DONE_GNETWORKING_H - - - - - diff --git a/build/win32/vs10/gmodule.vcxproj b/build/win32/vs10/gmodule.vcxproj index 8e7181731..71141fa06 100644 --- a/build/win32/vs10/gmodule.vcxproj +++ b/build/win32/vs10/gmodule.vcxproj @@ -51,19 +51,19 @@ - + - + - + - + @@ -169,6 +169,22 @@ + + + Copying gmoduleconf.h from gmoduleconf.h.win32... + $(GenGModuleConfH) + ..\..\..\gmodule\gmoduleconf.h;%(Outputs) + Copying gmoduleconf.h from gmoduleconf.h.win32... + $(GenGModuleConfH) + ..\..\..\gmodule\gmoduleconf.h;%(Outputs) + Copying gmoduleconf.h from gmoduleconf.h.win32... + $(GenGModuleConfH) + ..\..\..\gmodule\gmoduleconf.h;%(Outputs) + Copying gmoduleconf.h from gmoduleconf.h.win32... + $(GenGModuleConfH) + ..\..\..\gmodule\gmoduleconf.h;%(Outputs) + + diff --git a/build/win32/vs10/gmodule.vcxproj.filters b/build/win32/vs10/gmodule.vcxproj.filters index ceab446ee..968e8ac1d 100644 --- a/build/win32/vs10/gmodule.vcxproj.filters +++ b/build/win32/vs10/gmodule.vcxproj.filters @@ -19,6 +19,9 @@ Source Files + + Resource Files + Resource Files diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index d2cb4506b..0663334b0 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -52,22 +52,18 @@ - - - - diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am index cdca8013a..a998bfca7 100644 --- a/build/win32/vs9/Makefile.am +++ b/build/win32/vs9/Makefile.am @@ -23,4 +23,4 @@ EXTRA_DIST = \ glib-build-defines.vsprops \ glib-install.vsprops \ glib-version-paths.vsprops \ - glibprepbuild.vsprops + glib-gen-srcs.vsprops diff --git a/build/win32/vs9/gio.vcprojin b/build/win32/vs9/gio.vcprojin index 0b9308aed..cb8ca325a 100644 --- a/build/win32/vs9/gio.vcprojin +++ b/build/win32/vs9/gio.vcprojin @@ -20,7 +20,7 @@ @@ -52,7 +52,7 @@ @@ -116,7 +116,7 @@ + + + + + + + + + + + + + + diff --git a/build/win32/vs9/glib-gen-srcs.vsprops b/build/win32/vs9/glib-gen-srcs.vsprops new file mode 100644 index 000000000..7df2d21b0 --- /dev/null +++ b/build/win32/vs9/glib-gen-srcs.vsprops @@ -0,0 +1,32 @@ + + + + + + + diff --git a/build/win32/vs9/glib-install.vsprops b/build/win32/vs9/glib-install.vsprops index 7f4313cde..11fdeb907 100644 --- a/build/win32/vs9/glib-install.vsprops +++ b/build/win32/vs9/glib-install.vsprops @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="glibinstallprops" - InheritedPropertySheets=".\glib-version-paths.vsprops" + InheritedPropertySheets=".\glib-build-defines.vsprops" > @@ -52,7 +52,7 @@ @@ -115,7 +115,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/glibprepbuild.vsprops b/build/win32/vs9/glibprepbuild.vsprops deleted file mode 100644 index 1b6db8fb9..000000000 --- a/build/win32/vs9/glibprepbuild.vsprops +++ /dev/null @@ -1,27 +0,0 @@ - - - - diff --git a/build/win32/vs9/gmodule.vcproj b/build/win32/vs9/gmodule.vcproj index db1a1a429..4f33b6e04 100644 --- a/build/win32/vs9/gmodule.vcproj +++ b/build/win32/vs9/gmodule.vcproj @@ -21,7 +21,7 @@ @@ -51,7 +51,7 @@ @@ -111,7 +111,7 @@ + + + + + + + + + + + + + + diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj index d203aa7e8..19a124c3d 100644 --- a/build/win32/vs9/install.vcproj +++ b/build/win32/vs9/install.vcproj @@ -21,7 +21,7 @@