From: DongHun Kwak Date: Mon, 7 Sep 2020 06:42:21 +0000 (-0700) Subject: Imported Upstream version 2.37.7 X-Git-Tag: upstream/2.37.7^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4dcfd9f7c0c57477ed940fc4f9ddec69673475a4;p=platform%2Fupstream%2Fglibmm.git Imported Upstream version 2.37.7 --- diff --git a/MSVC_Net2005/examples/compose/compose.vcproj b/MSVC_Net2005/examples/compose/compose.vcproj index 7fa1b9b..55a30f5 100644 --- a/MSVC_Net2005/examples/compose/compose.vcproj +++ b/MSVC_Net2005/examples/compose/compose.vcproj @@ -27,25 +27,10 @@ CharacterSet="2" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -356,14 +170,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -356,14 +170,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,14 +171,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -356,14 +170,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -356,14 +170,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -340,14 +154,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - @@ -123,7 +72,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/vd2" Optimization="0" - AdditionalIncludeDirectories=".;../..;../../glib;../../gio;"$(SolutionDir)\glibmm";..\..\..\vs8\x64\include\gio-win32-2.0;..\..\..\vs8\x64\include\glib-2.0;..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\vs8\x64\include" + AdditionalIncludeDirectories=".;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs8\x64\include\gio-win32-2.0;..\..\..\vs8\x64\include\glib-2.0;..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\vs8\x64\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GIOMM_BUILD" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -151,30 +100,6 @@ GenerateDebugInformation="true" TargetMachine="17" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -337,938 +187,253 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + diff --git a/MSVC_Net2005/glibmm/glibmm.vcproj b/MSVC_Net2005/glibmm/glibmm.vcproj index fb0cc6b..b804334 100755 --- a/MSVC_Net2005/glibmm/glibmm.vcproj +++ b/MSVC_Net2005/glibmm/glibmm.vcproj @@ -27,25 +27,10 @@ CharacterSet="2" > - - - - - - - - - - - - - - - - - @@ -130,7 +79,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/vd2" Optimization="0" - AdditionalIncludeDirectories=".;../..;../../glib;..\..\..\vs8\x64\include\glib-2.0;..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\vs8\x64\include" + AdditionalIncludeDirectories=".;../..;../../glib;..\..\..\vs8\x64\include\glib-2.0;..\..\..\vs8\x64\lib\glib-2.0\include;..\..\..\vs8\x64\include\sigc++-2.0;..\..\..\vs8\x64\lib\sigc++-2.0\include;..\..\..\vs8\x64\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -163,30 +112,6 @@ GenerateDebugInformation="true" TargetMachine="17" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -359,547 +209,159 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + diff --git a/MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj b/MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj index b31aa04..d2d95c7 100644 --- a/MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj +++ b/MSVC_Net2005/tests/giomm_simple/giomm_simple.vcproj @@ -27,25 +27,10 @@ CharacterSet="2" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -353,14 +167,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -353,18 +167,9 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -353,14 +179,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -353,14 +179,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -354,14 +180,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -353,14 +179,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -353,14 +179,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -337,14 +163,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - @@ -123,7 +75,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/vd2" Optimization="0" - AdditionalIncludeDirectories=".;../..;../../glib;../../gio;"$(SolutionDir)\glibmm";..\..\..\vs9\x64\include\gio-win32-2.0;..\..\..\vs9\x64\include\glib-2.0;..\..\..\vs9\x64\lib\glib-2.0\include;..\..\..\vs9\x64\include\sigc++-2.0;..\..\..\vs9\x64\include" + AdditionalIncludeDirectories=".;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs9\x64\include\gio-win32-2.0;..\..\..\vs9\x64\include\glib-2.0;..\..\..\vs9\x64\lib\glib-2.0\include;..\..\..\vs9\x64\include\sigc++-2.0;..\..\..\vs9\x64\lib\sigc++-2.0\include;..\..\..\vs9\x64\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GIOMM_BUILD" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -153,27 +105,6 @@ DataExecutionPrevention="0" TargetMachine="17" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -334,938 +196,252 @@ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + diff --git a/MSVC_Net2008/glibmm/glibmm.vcproj b/MSVC_Net2008/glibmm/glibmm.vcproj index 017e833..f564cae 100644 --- a/MSVC_Net2008/glibmm/glibmm.vcproj +++ b/MSVC_Net2008/glibmm/glibmm.vcproj @@ -28,25 +28,10 @@ CharacterSet="2" > - - - - - - - - - - - - - - - - @@ -130,7 +82,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/vd2" Optimization="0" - AdditionalIncludeDirectories=".;../..;../../glib;..\..\..\vs9\x64\include\glib-2.0;..\..\..\vs9\x64\lib\glib-2.0\include;..\..\..\vs9\x64\include\sigc++-2.0;..\..\..\vs9\x64\include" + AdditionalIncludeDirectories=".;../..;../../glib;..\..\..\vs9\x64\include\glib-2.0;..\..\..\vs9\x64\lib\glib-2.0\include;..\..\..\vs9\x64\include\sigc++-2.0;..\..\..\vs9\x64\lib\sigc++-2.0\include;..\..\..\vs9\x64\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -165,27 +117,6 @@ DataExecutionPrevention="0" TargetMachine="17" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -356,547 +218,159 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + diff --git a/MSVC_Net2008/tests/giomm_simple/giomm_simple.vcproj b/MSVC_Net2008/tests/giomm_simple/giomm_simple.vcproj index dc5adc6..559eb36 100644 --- a/MSVC_Net2008/tests/giomm_simple/giomm_simple.vcproj +++ b/MSVC_Net2008/tests/giomm_simple/giomm_simple.vcproj @@ -28,25 +28,10 @@ CharacterSet="2" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -350,14 +176,8 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -350,18 +176,9 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > - - - - - - + + + Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)compose.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)compose.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)compose.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)compose.exe true diff --git a/MSVC_Net2010/examples/compose/compose.vcxproj.filters b/MSVC_Net2010/examples/compose/compose.vcxproj.filters index 974e9d3..edc1c16 100644 --- a/MSVC_Net2010/examples/compose/compose.vcxproj.filters +++ b/MSVC_Net2010/examples/compose/compose.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/dispatcher/dispatcher.vcxproj b/MSVC_Net2010/examples/dispatcher/dispatcher.vcxproj index c6d4591..5cc013d 100644 --- a/MSVC_Net2010/examples/dispatcher/dispatcher.vcxproj +++ b/MSVC_Net2010/examples/dispatcher/dispatcher.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)dispatcher.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)dispatcher.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)dispatcher.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)dispatcher.exe true diff --git a/MSVC_Net2010/examples/dispatcher/dispatcher.vcxproj.filters b/MSVC_Net2010/examples/dispatcher/dispatcher.vcxproj.filters index 0022975..cdd8623 100644 --- a/MSVC_Net2010/examples/dispatcher/dispatcher.vcxproj.filters +++ b/MSVC_Net2010/examples/dispatcher/dispatcher.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj b/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj index 8877f28..04eef36 100644 --- a/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj +++ b/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj @@ -85,8 +85,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -97,7 +97,7 @@ EditAndContinue - gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)dispatcher2.exe true @@ -111,8 +111,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -121,7 +121,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)dispatcher2.exe true @@ -140,8 +140,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -152,7 +152,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)dispatcher2.exe true @@ -169,8 +169,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -179,7 +179,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)dispatcher2.exe true diff --git a/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj.filters b/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj.filters index efcf8de..7f4637f 100644 --- a/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj.filters +++ b/MSVC_Net2010/examples/dispatcher2/dispatcher2.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/keyfile/keyfile.vcxproj b/MSVC_Net2010/examples/keyfile/keyfile.vcxproj index dcda9a4..15fa307 100644 --- a/MSVC_Net2010/examples/keyfile/keyfile.vcxproj +++ b/MSVC_Net2010/examples/keyfile/keyfile.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)keyfile.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)keyfile.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)keyfile.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)keyfile.exe true diff --git a/MSVC_Net2010/examples/keyfile/keyfile.vcxproj.filters b/MSVC_Net2010/examples/keyfile/keyfile.vcxproj.filters index b065b2d..f9bcc24 100644 --- a/MSVC_Net2010/examples/keyfile/keyfile.vcxproj.filters +++ b/MSVC_Net2010/examples/keyfile/keyfile.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/markup/markup.vcxproj b/MSVC_Net2010/examples/markup/markup.vcxproj index abd0685..28b4425 100644 --- a/MSVC_Net2010/examples/markup/markup.vcxproj +++ b/MSVC_Net2010/examples/markup/markup.vcxproj @@ -85,8 +85,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -111,8 +111,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -140,8 +140,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -169,8 +169,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/MSVC_Net2010/examples/markup/markup.vcxproj.filters b/MSVC_Net2010/examples/markup/markup.vcxproj.filters index a50a69d..0e2ae0b 100644 --- a/MSVC_Net2010/examples/markup/markup.vcxproj.filters +++ b/MSVC_Net2010/examples/markup/markup.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/options/options.vcxproj b/MSVC_Net2010/examples/options/options.vcxproj index c8ebf3f..76dade9 100644 --- a/MSVC_Net2010/examples/options/options.vcxproj +++ b/MSVC_Net2010/examples/options/options.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)options.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)options.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)options.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)options.exe true diff --git a/MSVC_Net2010/examples/options/options.vcxproj.filters b/MSVC_Net2010/examples/options/options.vcxproj.filters index bdc841b..f97535c 100644 --- a/MSVC_Net2010/examples/options/options.vcxproj.filters +++ b/MSVC_Net2010/examples/options/options.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/properties/properties.vcxproj b/MSVC_Net2010/examples/properties/properties.vcxproj index e492eeb..8facdd5 100644 --- a/MSVC_Net2010/examples/properties/properties.vcxproj +++ b/MSVC_Net2010/examples/properties/properties.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)properties.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)properties.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)properties.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)properties.exe true diff --git a/MSVC_Net2010/examples/properties/properties.vcxproj.filters b/MSVC_Net2010/examples/properties/properties.vcxproj.filters index 38b205d..ce38158 100644 --- a/MSVC_Net2010/examples/properties/properties.vcxproj.filters +++ b/MSVC_Net2010/examples/properties/properties.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/regex/regex.vcxproj b/MSVC_Net2010/examples/regex/regex.vcxproj index 7bb9697..080d6be 100644 --- a/MSVC_Net2010/examples/regex/regex.vcxproj +++ b/MSVC_Net2010/examples/regex/regex.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)regex.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)regex.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)regex.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)regex.exe true diff --git a/MSVC_Net2010/examples/regex/regex.vcxproj.filters b/MSVC_Net2010/examples/regex/regex.vcxproj.filters index 10fa37c..1cbe7e2 100644 --- a/MSVC_Net2010/examples/regex/regex.vcxproj.filters +++ b/MSVC_Net2010/examples/regex/regex.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/resolver/resolver.vcxproj b/MSVC_Net2010/examples/resolver/resolver.vcxproj index 1ea7943..556adf0 100644 --- a/MSVC_Net2010/examples/resolver/resolver.vcxproj +++ b/MSVC_Net2010/examples/resolver/resolver.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)resolver.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)resolver.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)resolver.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)resolver.exe true diff --git a/MSVC_Net2010/examples/resolver/resolver.vcxproj.filters b/MSVC_Net2010/examples/resolver/resolver.vcxproj.filters index 4318e85..5c85f32 100644 --- a/MSVC_Net2010/examples/resolver/resolver.vcxproj.filters +++ b/MSVC_Net2010/examples/resolver/resolver.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/socket-client/socket-client.vcxproj b/MSVC_Net2010/examples/socket-client/socket-client.vcxproj index ec66553..3a954af 100644 --- a/MSVC_Net2010/examples/socket-client/socket-client.vcxproj +++ b/MSVC_Net2010/examples/socket-client/socket-client.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)socket-client.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)socket-client.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)socket-client.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)socket-client.exe true diff --git a/MSVC_Net2010/examples/socket-client/socket-client.vcxproj.filters b/MSVC_Net2010/examples/socket-client/socket-client.vcxproj.filters index 4318e85..5c85f32 100644 --- a/MSVC_Net2010/examples/socket-client/socket-client.vcxproj.filters +++ b/MSVC_Net2010/examples/socket-client/socket-client.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/socket-server/socket-server.vcxproj b/MSVC_Net2010/examples/socket-server/socket-server.vcxproj index d62d0c0..4a7b95f 100644 --- a/MSVC_Net2010/examples/socket-server/socket-server.vcxproj +++ b/MSVC_Net2010/examples/socket-server/socket-server.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +98,7 @@ EditAndContinue - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)socket-server.exe true @@ -112,8 +112,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -122,7 +122,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)socket-server.exe true @@ -141,8 +141,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -153,7 +153,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)socket-server.exe true @@ -170,8 +170,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -180,7 +180,7 @@ ProgramDatabase - glib-2.0.lib;gthread-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + glib-2.0.lib;gobject-2.0.lib;gio-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)socket-server.exe true diff --git a/MSVC_Net2010/examples/socket-server/socket-server.vcxproj.filters b/MSVC_Net2010/examples/socket-server/socket-server.vcxproj.filters index 4318e85..5c85f32 100644 --- a/MSVC_Net2010/examples/socket-server/socket-server.vcxproj.filters +++ b/MSVC_Net2010/examples/socket-server/socket-server.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/thread/thread.vcxproj b/MSVC_Net2010/examples/thread/thread.vcxproj index 4e06d91..47eb873 100644 --- a/MSVC_Net2010/examples/thread/thread.vcxproj +++ b/MSVC_Net2010/examples/thread/thread.vcxproj @@ -85,8 +85,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -97,7 +97,7 @@ EditAndContinue - gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)thread.exe true @@ -111,8 +111,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -121,7 +121,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)thread.exe true @@ -140,8 +140,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -152,7 +152,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)thread.exe true @@ -169,8 +169,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -179,7 +179,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)thread.exe true diff --git a/MSVC_Net2010/examples/thread/thread.vcxproj.filters b/MSVC_Net2010/examples/thread/thread.vcxproj.filters index 0deb5fb..e44f7ae 100644 --- a/MSVC_Net2010/examples/thread/thread.vcxproj.filters +++ b/MSVC_Net2010/examples/thread/thread.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj b/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj index 2a41d0c..cd18292 100644 --- a/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj +++ b/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj @@ -85,8 +85,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -97,7 +97,7 @@ EditAndContinue - gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)thread_pool.exe true @@ -111,8 +111,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -121,7 +121,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\win32\lib;%(AdditionalLibraryDirectories) $(OutDir)thread_pool.exe true @@ -140,8 +140,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -152,7 +152,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-d-2_0.lib;%(AdditionalDependencies) + sigc-vc100-d-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)thread_pool.exe true @@ -169,8 +169,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -179,7 +179,7 @@ ProgramDatabase - gthread-2.0.lib;sigc-vc100-2_0.lib;%(AdditionalDependencies) + sigc-vc100-2_0.lib;%(AdditionalDependencies) ..\..\..\..\vs10\x64\lib;%(AdditionalLibraryDirectories) $(OutDir)thread_pool.exe true diff --git a/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj.filters b/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj.filters index 30273e3..1ae3f74 100644 --- a/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj.filters +++ b/MSVC_Net2010/examples/thread_pool/thread_pool.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/gendef/gendef.vcxproj b/MSVC_Net2010/gendef/gendef.vcxproj index 8490a96..4af7e39 100644 --- a/MSVC_Net2010/gendef/gendef.vcxproj +++ b/MSVC_Net2010/gendef/gendef.vcxproj @@ -60,7 +60,6 @@ - <_ProjectFileVersion>10.0.30319.1 $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true @@ -81,7 +80,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -103,7 +102,7 @@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ;%(PreprocessorDefinitions) MultiThreaded @@ -128,7 +127,7 @@ Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -153,7 +152,7 @@ X64 - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + ;%(PreprocessorDefinitions) MultiThreaded diff --git a/MSVC_Net2010/gendef/gendef.vcxproj.filters b/MSVC_Net2010/gendef/gendef.vcxproj.filters index ec3f611..a1df3f0 100644 --- a/MSVC_Net2010/gendef/gendef.vcxproj.filters +++ b/MSVC_Net2010/gendef/gendef.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/giomm/giomm.vcxproj b/MSVC_Net2010/giomm/giomm.vcxproj index f63f58b..f22cc39 100644 --- a/MSVC_Net2010/giomm/giomm.vcxproj +++ b/MSVC_Net2010/giomm/giomm.vcxproj @@ -77,7 +77,7 @@ /vd2 %(AdditionalOptions) Disabled - .;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + .;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GIOMM_BUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -107,7 +107,7 @@ /vd2 %(AdditionalOptions) Disabled - .;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + .;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GIOMM_BUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -134,7 +134,7 @@ /vd2 %(AdditionalOptions) - .;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + .;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GIOMM_BUILD;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -160,7 +160,7 @@ /vd2 %(AdditionalOptions) - .;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + .;../..;../../glib;../../gio;$(SolutionDir)\glibmm;..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GIOMM_BUILD;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -208,11 +208,14 @@ + + + @@ -287,7 +290,6 @@ - @@ -324,11 +326,14 @@ + + + @@ -403,7 +408,6 @@ - diff --git a/MSVC_Net2010/giomm/giomm.vcxproj.filters b/MSVC_Net2010/giomm/giomm.vcxproj.filters index 79c0207..09bb3f0 100644 --- a/MSVC_Net2010/giomm/giomm.vcxproj.filters +++ b/MSVC_Net2010/giomm/giomm.vcxproj.filters @@ -15,696 +15,242 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files - - Resource Files + Resource Files \ No newline at end of file diff --git a/MSVC_Net2010/glibmm/glibmm.vcxproj b/MSVC_Net2010/glibmm/glibmm.vcxproj index b3b1f94..afc4abc 100644 --- a/MSVC_Net2010/glibmm/glibmm.vcxproj +++ b/MSVC_Net2010/glibmm/glibmm.vcxproj @@ -87,7 +87,7 @@ /vd2 %(AdditionalOptions) Disabled - .;../..;../../glib;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + .;../..;../../glib;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -120,7 +120,7 @@ /vd2 %(AdditionalOptions) Disabled - .;../..;../../glib;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + .;../..;../../glib;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD;%(PreprocessorDefinitions) true EnableFastChecks @@ -150,7 +150,7 @@ /vd2 %(AdditionalOptions) - .;../..;../../glib;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + .;../..;../../glib;..\..\..\vs10\win32\include\glib-2.0;..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -179,7 +179,7 @@ /vd2 %(AdditionalOptions) - .;../..;../../glib;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + .;../..;../../glib;..\..\..\vs10\x64\include\glib-2.0;..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GLIBMM_BUILD;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -204,7 +204,9 @@ + + @@ -212,6 +214,7 @@ + @@ -251,6 +254,7 @@ + @@ -263,20 +267,23 @@ + + + - + @@ -322,6 +329,7 @@ + @@ -334,6 +342,7 @@ + diff --git a/MSVC_Net2010/glibmm/glibmm.vcxproj.filters b/MSVC_Net2010/glibmm/glibmm.vcxproj.filters index 3993f37..7bb409c 100644 --- a/MSVC_Net2010/glibmm/glibmm.vcxproj.filters +++ b/MSVC_Net2010/glibmm/glibmm.vcxproj.filters @@ -15,402 +15,150 @@ - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files + Header Files - - Resource Files + Resource Files \ No newline at end of file diff --git a/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj b/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj index ded38c6..c4117c0 100644 --- a/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj +++ b/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -111,8 +111,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\win32\include\gio-win32-2.0;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -139,8 +139,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -167,8 +167,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\..\gio;$(SolutionDir)\glibmm;$(SolutionDir)\giomm;..\..\..\..\vs10\x64\include\gio-win32-2.0;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj.filters b/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj.filters index be54047..09cfce5 100644 --- a/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj.filters +++ b/MSVC_Net2010/tests/giomm_simple/giomm_simple.vcxproj.filters @@ -15,8 +15,6 @@ - - Source Files - + Source Files \ No newline at end of file diff --git a/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj b/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj index e46b9b9..6f6ca3c 100644 --- a/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj +++ b/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj @@ -86,8 +86,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -111,8 +111,8 @@ - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\win32\include\glib-2.0;..\..\..\..\vs10\win32\lib\glib-2.0\include;..\..\..\..\vs10\win32\include\sigc++-2.0;..\..\..\..\vs10\win32\lib\sigc++-2.0\include;..\..\..\..\vs10\win32\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -139,8 +139,8 @@ Disabled - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -167,8 +167,8 @@ X64 - $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\..\glib;$(SolutionDir)\glibmm;..\..\..\..\vs10\x64\include\glib-2.0;..\..\..\..\vs10\x64\lib\glib-2.0\include;..\..\..\..\vs10\x64\include\sigc++-2.0;..\..\..\..\vs10\x64\lib\sigc++-2.0\include;..\..\..\..\vs10\x64\include;%(AdditionalIncludeDirectories) + ;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj.filters b/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj.filters index 295d66d..3e07ccf 100644 --- a/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj.filters +++ b/MSVC_Net2010/tests/glibmm_value/glibmm_value.vcxproj.filters @@ -15,11 +15,7 @@ - - Source Files - - - Source Files - + Source Files + Source Files \ No newline at end of file diff --git a/NEWS b/NEWS index 8731232..52a9ae7 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,22 @@ -2.37.6 (unstable): +2.37.7 (unstable): + +Gio: +* Menu: Add insert/append/prepend_section() with no label parameter. + (Murray Cumming) Bug #702456 (Aurimas Černius) + +gmmproc: +* Pass NULL to C function calls for optional empty strings. + (José Alburquerque) Bug #686909. Bug #702456 +* Add parameter return_value in _WRAP_VFUNC. + (Marcin Kolny) Bug #705699. + +Build: +* Update Visual Studio Projects + (Chun-wei Fan) +2.37.6 (unstable): + Gio: * Action: - Make get_state() templated. diff --git a/configure.ac b/configure.ac index 51603c9..9c68e08 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU Lesser General Public License ## along with this library. If not, see . -AC_INIT([glibmm], [2.37.6], +AC_INIT([glibmm], [2.37.7], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm], [glibmm], [http://www.gtkmm.org/]) AC_PREREQ([2.59]) @@ -60,7 +60,7 @@ AS_IF([test "x$enable_static" = xyes], AC_DEFINE([GIOMM_STATIC_LIB], [1], [Define if giomm is built as a static library]) ]) -glibreq='2.0 >= 2.37.5' +glibreq='2.0 >= 2.37.7' GLIBMM_MODULES="sigc++-2.0 >= 2.2.10 glib-$glibreq gobject-$glibreq gmodule-$glibreq" GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq" diff --git a/gio/src/menu.hg b/gio/src/menu.hg index dd88b0f..fee1ddd 100644 --- a/gio/src/menu.hg +++ b/gio/src/menu.hg @@ -59,9 +59,9 @@ public: _WRAP_METHOD(void prepend(const Glib::ustring& label, const Glib::ustring& detailed_action = Glib::ustring()), g_menu_prepend) _WRAP_METHOD(void append(const Glib::ustring& label, const Glib::ustring& detailed_action = Glib::ustring()), g_menu_append) - _WRAP_METHOD(void insert_section(int position, const Glib::ustring& label, const Glib::RefPtr& section), g_menu_insert_section) - _WRAP_METHOD(void prepend_section(const Glib::ustring& label, const Glib::RefPtr& section), g_menu_prepend_section) - _WRAP_METHOD(void append_section(const Glib::ustring& label, const Glib::RefPtr& section), g_menu_append_section) + _WRAP_METHOD(void insert_section(int position, const Glib::ustring& label{?}, const Glib::RefPtr& section), g_menu_insert_section) + _WRAP_METHOD(void prepend_section(const Glib::ustring& label{?}, const Glib::RefPtr& section), g_menu_prepend_section) + _WRAP_METHOD(void append_section(const Glib::ustring& label{?}, const Glib::RefPtr& section), g_menu_append_section) _WRAP_METHOD(void insert_submenu(int position, const Glib::ustring& label, const Glib::RefPtr& submenu), g_menu_insert_submenu) _WRAP_METHOD(void prepend_submenu(const Glib::ustring& label, const Glib::RefPtr& submenu), g_menu_prepend_submenu) diff --git a/gio/src/simpleaction.hg b/gio/src/simpleaction.hg index 30f7ad9..20a240d 100644 --- a/gio/src/simpleaction.hg +++ b/gio/src/simpleaction.hg @@ -80,7 +80,7 @@ public: */ _WRAP_CREATE(const Glib::ustring& name, const Glib::VariantBase& state) - //TODO: Use similar C API if they ever add it. Doing this manually is tedious. + //TODO: Use similar C API if they ever add it. Doing this manually is tedious. See https://bugzilla.gnome.org/show_bug.cgi?id=705655 //TODO: Create a derived SimpleToggleAction class for this? //TODO: Document how the app must handle signal_activate() to call change_state(). /** Creates a new boolean stateful action. @@ -95,7 +95,7 @@ public: */ static Glib::RefPtr create_bool(const Glib::ustring&name, bool state = false); - //TODO: Use similar C API if they ever add it. Doing this manually is tedious. + //TODO: Use similar C API if they ever add it. Doing this manually is tedious. See https://bugzilla.gnome.org/show_bug.cgi?id=705655 //TODO: Create a derived SimpleToggleAction class for this? //TODO: Create convenience API that auto-changes the state, like Gtk::TreeView's append_column_editable()? // See https://bugzilla.gnome.org/show_bug.cgi?id=705133 (it's not documented clearly at all). @@ -109,7 +109,7 @@ public: */ static Glib::RefPtr create_radio_string(const Glib::ustring& name, const Glib::ustring& initial_state); - //TODO: Use similar C API if they ever add it. Doing this manually is tedious. + //TODO: Use similar C API if they ever add it. Doing this manually is tedious. See https://bugzilla.gnome.org/show_bug.cgi?id=705655 //TODO: Create a derived SimpleToggleAction class for this? //TODO: Create convenience API that auto-changes the state, like Gtk::TreeView's append_column_editable()? // See https://bugzilla.gnome.org/show_bug.cgi?id=705133 (it's not documented clearly at all). diff --git a/tools/m4/vfunc.m4 b/tools/m4/vfunc.m4 index 061ba5c..652aabc 100644 --- a/tools/m4/vfunc.m4 +++ b/tools/m4/vfunc.m4 @@ -22,8 +22,8 @@ dnl $1 $2 $3 $4 dnl _VFUNC_PCC(cppname,gtkname,cpprettype,crettype, dnl $5 $6 $7 $8 $9 $10 $11 dnl `',`',`',firstarg, refreturn_ctype, ifdef, errthrow, -dnl $12 $13 -dnl slot_type, c_data_param_name) +dnl $12 $13 $14 +dnl slot_type, c_data_param_name, return_value) dnl dnl Note: _get_current_wrapper_inline() could be used throughout for performance instead of _get_current_wrapper(), dnl and is_derived_() instead of is_derived_(), @@ -103,17 +103,20 @@ ifelse($4,void,,` return retval; } ifelse($4,void,,`dnl - +ifelse(`$14', `',`dnl typedef $4 RType; return RType`'(); +',`dnl + return _CONVERT($3,$4,`$14'); +')dnl ')dnl } ifelse(`$10',,,`#endif // $10 ')dnl _POP()') -# $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 -# _VFUNC_CC(vfunc_name, gtkname, cpp_rettype, c_rettype, `', `', is_const, refreturn, $ifdef, $errthrow, $slot_type, $slot_name, $no_slot_copy) +# $1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 +# _VFUNC_CC(vfunc_name, gtkname, cpp_rettype, c_rettype, `', `', is_const, refreturn, $ifdef, $errthrow, $slot_type, $slot_name, $no_slot_copy, $returnValue) # define(`_VFUNC_CC',`dnl _PUSH(SECTION_CC_VFUNCS) @@ -161,8 +164,12 @@ ifelse($10,errthrow,`dnl return retval; } +ifelse(`$14', `',`dnl typedef $3 RType; return RType`'(); +',`dnl + return $14; +')dnl ')dnl } ifelse(`$9',,,`#endif // $9 diff --git a/tools/pm/Output.pm b/tools/pm/Output.pm index 8ad75d0..975ba75 100644 --- a/tools/pm/Output.pm +++ b/tools/pm/Output.pm @@ -170,6 +170,7 @@ sub output_wrap_vfunc_cc($$$$$$$$) { my $refreturn = ""; $refreturn = "refreturn" if($$objCppfunc{rettype_needs_ref}); + my $returnValue = $$objCppfunc{return_value}; my ($conversions, $declarations, $initializations) = convert_args_cpp_to_c($objCppfunc, $objCFunc, 0, $line_num, $errthrow); @@ -177,7 +178,7 @@ sub output_wrap_vfunc_cc($$$$$$$$) my $no_slot_copy = ""; $no_slot_copy = "no_slot_copy" if ($$objCppfunc{no_slot_copy}); - my $str = sprintf("_VFUNC_CC(%s,%s,%s,%s,\`%s\',\`%s\',%s,%s,%s,%s,%s,%s,%s)dnl\n", + my $str = sprintf("_VFUNC_CC(%s,%s,%s,%s,\`%s\',\`%s\',%s,%s,%s,%s,%s,%s,%s,%s)dnl\n", $$objCppfunc{name}, $cname, $$objCppfunc{rettype}, @@ -190,7 +191,8 @@ sub output_wrap_vfunc_cc($$$$$$$$) $errthrow, $$objCppfunc{slot_type}, $$objCppfunc{slot_name}, - $no_slot_copy); + $no_slot_copy, + $returnValue); $self->append($str); } @@ -206,7 +208,9 @@ sub output_wrap_vfunc_cc($$$$$$$$) my $conversions = convert_args_c_to_cpp($objCFunc, $objCppfunc, $line_num); - my $str = sprintf("_VFUNC_PCC(%s,%s,%s,%s,\`%s\',\`%s\',\`%s\',%s,%s,%s,%s,%s,%s)dnl\n", + my $returnValue = $$objCppfunc{return_value}; + + my $str = sprintf("_VFUNC_PCC(%s,%s,%s,%s,\`%s\',\`%s\',\`%s\',%s,%s,%s,%s,%s,%s,%s)dnl\n", $$objCppfunc{name}, $cname, $$objCppfunc{rettype}, @@ -219,7 +223,8 @@ sub output_wrap_vfunc_cc($$$$$$$$) $ifdef, $errthrow, $$objCppfunc{slot_type}, - $$objCppfunc{c_data_param_name}); + $$objCppfunc{c_data_param_name}, + $returnValue); $self->append($str); } @@ -1158,13 +1163,21 @@ sub convert_args_cpp_to_c($$$$$) if ($cppParamType ne $cParamType) #If a type conversion is needed. { - - - push(@conversions, sprintf("_CONVERT(%s,%s,%s,%s)", - $cppParamType, - $cParamType, - $cppParamName, - $wrap_line_number) ); + my $std_conversion = sprintf("_CONVERT(%s,%s,%s,%s)", + $cppParamType, + $cParamType, + $cppParamName, + $wrap_line_number); + + if (($$cpp_param_flags[$cpp_param_index] & FLAG_PARAM_OPTIONAL) && + $cppParamType =~ /^(const\s+)?(std::string|Glib::ustring)&?/) + { + push(@conversions, "$cppParamName.empty() ? 0 : " . $std_conversion); + } + else + { + push(@conversions, $std_conversion); + } } else { diff --git a/tools/pm/WrapParser.pm b/tools/pm/WrapParser.pm index f87efd6..d956fd2 100644 --- a/tools/pm/WrapParser.pm +++ b/tools/pm/WrapParser.pm @@ -1242,6 +1242,7 @@ sub on_wrap_vfunc($) my $refreturn = 0; my $refreturn_ctype = 0; + my $returnValue = ""; my $custom_vfunc = 0; my $custom_vfunc_callback = 0; my $ifdef = ""; @@ -1263,6 +1264,13 @@ sub on_wrap_vfunc($) { $refreturn_ctype = 1; } + # Return value, if neither the underlying C class defines the vfunc + # nor the C++ vfunc is overridden in a user-defined subclass. + # (Default is the default value of the return type, e.g. false or 0.) + elsif($argRef =~ /^return_value\s+(.*)/) + { + $returnValue = $1; + } elsif($argRef eq "custom_vfunc") { $custom_vfunc = 1; @@ -1303,7 +1311,7 @@ sub on_wrap_vfunc($) $self->output_wrap_vfunc($argCppDecl, $argCName, $$self{filename}, $$self{line_num}, $refreturn, $refreturn_ctype, $custom_vfunc, $custom_vfunc_callback, $ifdef, $errthrow, - $slot_name, $slot_callback, $no_slot_copy); + $slot_name, $slot_callback, $no_slot_copy, $returnValue); } sub on_wrap_enum($) @@ -1500,12 +1508,12 @@ sub output_wrap_signal($$$$$$$$$$$) # void output_wrap_vfunc($CppDecl, $vfunc_name, $filename, $line_num, # $refreturn, $refreturn_ctype, # $custom_vfunc, $custom_vfunc_callback, $ifdef, $errthrow, -# $slot_name, $slot_callback, $no_slot_copy) -sub output_wrap_vfunc($$$$$$$$$$$$) +# $slot_name, $slot_callback, $no_slot_copy, $returnValue) +sub output_wrap_vfunc($$$$$$$$$$$$$) { my ($self, $CppDecl, $vfunc_name, $filename, $line_num, $refreturn, $refreturn_ctype, $custom_vfunc, $custom_vfunc_callback, $ifdef, $errthrow, - $slot_name, $slot_callback, $no_slot_copy) = @_; + $slot_name, $slot_callback, $no_slot_copy, $returnValue) = @_; #Some checks: return if ($self->output_wrap_check($CppDecl, $vfunc_name, $filename, $line_num, '_WRAP_VFUNC')); @@ -1536,6 +1544,7 @@ sub output_wrap_vfunc($$$$$$$$$$$$) # These macros are defined in vfunc.m4: $$objCppVfunc{rettype_needs_ref} = $refreturn; + $$objCppVfunc{return_value} = $returnValue; $$objCppVfunc{name} .= "_vfunc"; #All vfuncs should have the "_vfunc" suffix, and a separate easily-named invoker method. # Store the slot information in the vfunc if specified.