Revert "Add gobject support to build."

This reverts commit af9e9d7.
coapp-packages · Oct 12, 2012 · 127cf8f · 127cf8f
1 parent 7d0b6d2
commit 127cf8f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/COPKG/cairo/cairo-features.h b/COPKG/cairo/cairo-features.h
@@ -11,6 +11,4 @@
 #define CAIRO_HAS_SVG_SURFACE 1
 #define CAIRO_HAS_INTERPRETER 1
 
-#define CAIRO_HAS_GOBJECT_FUNCTIONS 1
-
 #endif
diff --git a/COPKG/cairo/cairo/cairo.vcxproj b/COPKG/cairo/cairo/cairo.vcxproj
@@ -39,12 +39,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir);$(SolutionDir)..\..\src;$(ProgramData)\include\pixman;$(ProgramData)\include\zlib;$(ProgramData)\include\libpng15;$(ProgramData)\include\glib;$(ProgramData)\include\glib\glib-2.0;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(ProgramData)\include\pixman;$(ProgramData)\include\zlib;$(ProgramData)\include\libpng15;$(IncludePath)</IncludePath>
     <LibraryPath>$(ProgramData)\lib\x86;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir);$(SolutionDir)..\..\src;$(ProgramData)\include\pixman;$(ProgramData)\include\zlib;$(ProgramData)\include\libpng15;$(ProgramData)\include\glib;$(ProgramData)\include\glib\glib-2.0;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir);$(SolutionDir)..\..\src;$(ProgramData)\include\pixman;$(ProgramData)\include\zlib;$(ProgramData)\include\libpng15;$(IncludePath)</IncludePath>
     <LibraryPath>$(ProgramData)\lib\x86;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -58,7 +58,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>msimg32.lib;zlib.lib;pixman.lib;libpng15.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>msimg32.lib;zlib.lib;pixman.lib;libpng15.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -76,7 +76,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>msimg32.lib;zlib.lib;pixman.lib;libpng15.lib;glib-2.0.lib;gobject-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>msimg32.lib;zlib.lib;pixman.lib;libpng15.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -206,11 +206,8 @@
     <ClCompile Include="..\..\..\src\win32\cairo-win32-printing-surface.c" />
     <ClCompile Include="..\..\..\src\win32\cairo-win32-surface.c" />
     <ClCompile Include="..\..\..\src\win32\cairo-win32-system.c" />
-    <ClCompile Include="..\..\..\util\cairo-gobject\cairo-gobject-enums.c" />
-    <ClCompile Include="..\..\..\util\cairo-gobject\cairo-gobject-structs.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\util\cairo-gobject\cairo-gobject.h" />
     <ClInclude Include="..\cairo-features.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/COPKG/cairo/cairo/cairo.vcxproj.filters b/COPKG/cairo/cairo/cairo.vcxproj.filters
@@ -393,19 +393,10 @@
     <ClCompile Include="..\..\..\src\cairo-mempool.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\util\cairo-gobject\cairo-gobject-enums.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\util\cairo-gobject\cairo-gobject-structs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\cairo-features.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\util\cairo-gobject\cairo-gobject.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>