r7391 - in mugshot-client/trunk/windows: . HippoCommon HippoExplorer HippoFirefox HippoIpc HippoUI cairo dependencies libddm libglib libgmodule libgobject libgthread libpango libpangocairo libpangowin32 loudmouth
- From: commits mugshot org
- To: online-desktop-list gnome org
- Subject: r7391 - in mugshot-client/trunk/windows: . HippoCommon HippoExplorer HippoFirefox HippoIpc HippoUI cairo dependencies libddm libglib libgmodule libgobject libgthread libpango libpangocairo libpangowin32 loudmouth
- Date: Wed, 26 Mar 2008 09:09:15 -0500 (CDT)
Author: otaylor
Date: 2008-03-26 09:09:11 -0500 (Wed, 26 Mar 2008)
New Revision: 7391
Added:
mugshot-client/trunk/windows/dependencies/
mugshot-client/trunk/windows/dependencies/Makefile
mugshot-client/trunk/windows/dependencies/dependencies.vcproj
Modified:
mugshot-client/trunk/windows/HippoCommon/HippoCommon.vsprops
mugshot-client/trunk/windows/HippoExplorer/HippoExplorer.vsprops
mugshot-client/trunk/windows/HippoFirefox/HippoFirefox.vsprops
mugshot-client/trunk/windows/HippoIpc/HippoIpc.vsprops
mugshot-client/trunk/windows/HippoUI/HippoUI.vsprops
mugshot-client/trunk/windows/cairo/cairo.vcproj
mugshot-client/trunk/windows/cairo/cairo.vsprops
mugshot-client/trunk/windows/libddm/libddm.vsprops
mugshot-client/trunk/windows/libglib/libglib.vcproj
mugshot-client/trunk/windows/libglib/libglib.vsprops
mugshot-client/trunk/windows/libgmodule/libgmodule.vcproj
mugshot-client/trunk/windows/libgmodule/libgmodule.vsprops
mugshot-client/trunk/windows/libgobject/libgobject.vcproj
mugshot-client/trunk/windows/libgobject/libgobject.vsprops
mugshot-client/trunk/windows/libgthread/libgthread.vcproj
mugshot-client/trunk/windows/libgthread/libgthread.vsprops
mugshot-client/trunk/windows/libpango/libpango.vcproj
mugshot-client/trunk/windows/libpango/libpango.vsprops
mugshot-client/trunk/windows/libpangocairo/libpangocairo.vcproj
mugshot-client/trunk/windows/libpangocairo/libpangocairo.vsprops
mugshot-client/trunk/windows/libpangowin32/libpangowin32.vcproj
mugshot-client/trunk/windows/libpangowin32/libpangowin32.vsprops
mugshot-client/trunk/windows/loudmouth/loudmouth.vcproj
mugshot-client/trunk/windows/loudmouth/loudmouth.vsprops
Log:
Search-and-replace fixups for module reorganization (untested)
Modified: mugshot-client/trunk/windows/HippoCommon/HippoCommon.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoCommon/HippoCommon.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/HippoCommon/HippoCommon.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../HippoUtil;../cairo;../../common/cairo/src;../../common/glib;../../common/glib/glib;../../common/pango;../libglib;../dependencies/gettext/include;../dependencies/jpeg/include;"../../../desktop-data-model";../../common;../../common/loudmouth;../../canvas/common;../../common/hippo/generated"
+ AdditionalIncludeDirectories=".;../HippoUtil;../cairo;../../../mugshot-dependencies/cairo/src;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../../../mugshot-dependencies/pango;../libglib;../../mugshot-dependencies/windows-binary/gettext/include;../../mugshot-dependencies/windows-binary/jpeg/include;"../../../desktop-data-model";../../common;../../../mugshot-dependencies/loudmouth;../../canvas/common;../../../mugshot-dependencies/hippo/generated"
PreprocessorDefinitions="DDM_I_KNOW_THIS_IS_UNSTABLE"
DisableSpecificWarnings="4311;4244;4267"
/>
Modified: mugshot-client/trunk/windows/HippoExplorer/HippoExplorer.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoExplorer/HippoExplorer.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/HippoExplorer/HippoExplorer.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../HippoUtil;../../common/hippoipc;../HippoIpc"
+ AdditionalIncludeDirectories="../HippoUtil;../../../mugshot-dependencies/hippoipc;../HippoIpc"
PreprocessorDefinitions="NOMINMAX"
/>
<Tool
Modified: mugshot-client/trunk/windows/HippoFirefox/HippoFirefox.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoFirefox/HippoFirefox.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/HippoFirefox/HippoFirefox.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""c:\Program Files\gecko-sdk\include";"../../common/firefox/gecko-private/include";../../common/hippoipc;../HippoUtil;../HippoIpc;"$(IntDir)""
+ AdditionalIncludeDirectories=""c:\Program Files\gecko-sdk\include";"../../../mugshot-dependencies/firefox/gecko-private/include";../../../mugshot-dependencies/hippoipc;../HippoUtil;../HippoIpc;"$(IntDir)""
PreprocessorDefinitions="HIPPO_OS_WINDOWS"
/>
<Tool
Modified: mugshot-client/trunk/windows/HippoIpc/HippoIpc.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoIpc/HippoIpc.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/HippoIpc/HippoIpc.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -7,6 +7,6 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../common/hippoipc;../HippoUtil"
+ AdditionalIncludeDirectories="../../../mugshot-dependencies/hippoipc;../HippoUtil"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/HippoUI/HippoUI.vsprops
===================================================================
--- mugshot-client/trunk/windows/HippoUI/HippoUI.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/HippoUI/HippoUI.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -7,14 +7,14 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../HippoUtil;../../common/glib;../../common/glib/glib;../libglib;../cairo;../../common/cairo/src;../../common/pango;../../common/loudmouth;"../../../desktop-data-model";../../common;../../canvas/common;../../common/airbag/src/client/windows"
+ AdditionalIncludeDirectories="../HippoUtil;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../cairo;../../../mugshot-dependencies/cairo/src;../../../mugshot-dependencies/pango;../../../mugshot-dependencies/loudmouth;"../../../desktop-data-model";../../common;../../canvas/common;../../../mugshot-dependencies/airbag/src/client/windows"
PreprocessorDefinitions="NOMINMAX;DDM_I_KNOW_THIS_IS_UNSTABLE"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="shlwapi.lib ws2_32.lib wininet.lib urlmon.lib advapi32.lib gdi32.lib shell32.lib comctl32.lib jpeg.lib"
OutputFile="$(OutDir)/Mugshot.exe"
- AdditionalLibraryDirectories="../debug;../dependencies/glib/lib;../dependencies/cairo/lib;../dependencies/pango/lib;../dependencies/jpeg/lib"
+ AdditionalLibraryDirectories="../debug;../../mugshot-dependencies/windows-binary/jpeg/lib"
/>
<Tool
Name="VCResourceCompilerTool"
Modified: mugshot-client/trunk/windows/cairo/cairo.vcproj
===================================================================
--- mugshot-client/trunk/windows/cairo/cairo.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/cairo/cairo.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -154,247 +154,247 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\cairo\src\cairo-analysis-surface.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-analysis-surface.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-arc.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-arc.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-array.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-array.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-cache.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-cache.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-clip.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-clip.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-color.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-color.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-debug.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-debug.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-fixed.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-fixed.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-font-options.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-font-options.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-font.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-font.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-gstate.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-gstate.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-hash.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-hash.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-hull.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-hull.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-image-surface.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-image-surface.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-matrix.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-matrix.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-meta-surface.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-meta-surface.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-operator.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-operator.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-output-stream.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-output-stream.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-paginated-surface.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-paginated-surface.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-path-bounds.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-path-bounds.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-path-data.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-path-data.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-path-fill.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-path-fill.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-path-stroke.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-path-stroke.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-path.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-path.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-pattern.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-pattern.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-pen.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-pen.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-png.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-png.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-polygon.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-polygon.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-rectangle.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-rectangle.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-region.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-region.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-scaled-font-subsets.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-scaled-font-subsets.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-scaled-font.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-scaled-font.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-slope.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-slope.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-spline.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-spline.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-stroke-style.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-stroke-style.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-surface-fallback.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-surface-fallback.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-surface.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-surface.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-traps.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-traps.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-unicode.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-unicode.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-wideint.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-wideint.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-win32-font.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-win32-font.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-win32-surface.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-win32-surface.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\fbcompose.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\fbcompose.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\fbedge.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\fbedge.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\fbpict.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\fbpict.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\fbtrap.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\fbtrap.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icblt.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icblt.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icbltone.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icbltone.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\iccolor.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\iccolor.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icformat.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icformat.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icimage.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icimage.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icpixels.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icpixels.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icrect.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icrect.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icstipple.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icstipple.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\ictransform.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\ictransform.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\ictrap.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\ictrap.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\ictri.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\ictri.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icutil.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icutil.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\pixregion.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\pixregion.c"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\renderedge.c"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\renderedge.c"
>
</File>
</Filter>
@@ -404,23 +404,23 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\common\cairo\src\cairo-analysis-surface-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-analysis-surface-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-arc-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-arc-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-cache-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-cache-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-clip-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-clip-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-directfb.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-directfb.h"
>
</File>
<File
@@ -428,67 +428,67 @@
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-gstate-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-gstate-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-hash-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-hash-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-meta-surface-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-meta-surface-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-output-stream-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-output-stream-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-paginated-surface-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-paginated-surface-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-path-data-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-path-data-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-path-fixed-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-path-fixed-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-scaled-font-subsets-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-scaled-font-subsets-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-scaled-font-test.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-scaled-font-test.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-surface-fallback-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-surface-fallback-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-wideint-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-wideint-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-win32-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-win32-private.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo-win32.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo-win32.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairo.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairo.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\src\cairoint.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\src\cairoint.h"
>
</File>
<File
@@ -496,39 +496,39 @@
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\fbedgeimp.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\fbedgeimp.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\fbpict.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\fbpict.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icimage.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icimage.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\icint.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\icint.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\pixman-xserver-compat.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\pixman-xserver-compat.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\pixman.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\pixman.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\pixregionint.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\pixregionint.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\renderedge.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\renderedge.h"
>
</File>
<File
- RelativePath="..\..\common\cairo\pixman\src\slim_internal.h"
+ RelativePath="..\..\..\mugshot-dependencies\cairo\pixman\src\slim_internal.h"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/cairo/cairo.vsprops
===================================================================
--- mugshot-client/trunk/windows/cairo/cairo.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/cairo/cairo.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;..\..\common\cairo\src;..\..\common\cairo\pixman\src;..\dependencies\libpng\include;..\dependencies\zlib\include"
+ AdditionalIncludeDirectories=".;..\..\..\mugshot-dependencies\cairo\src;..\..\..\mugshot-dependencies\cairo\pixman\src;..\..\mugshot-dependencies\windows-binary\libpng\include;..\..\mugshot-dependencies\windows-binary\zlib\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;BUILDING_CAIRO"
DisableSpecificWarnings="4146;4244;4267;4311"
/>
@@ -14,6 +14,6 @@
Name="VCLinkerTool"
AdditionalDependencies="libpng.lib"
OutputFile="$(OutDir)\libcairo-2.dll"
- AdditionalLibraryDirectories="..\dependencies\libpng\lib\"
+ AdditionalLibraryDirectories="..\..\mugshot-dependencies\windows-binary\libpng\lib\"
/>
</VisualStudioPropertySheet>
Copied: mugshot-client/trunk/windows/dependencies/Makefile (from rev 7390, mugshot-dependencies/trunk/windows-binary/Makefile)
===================================================================
--- mugshot-dependencies/trunk/windows-binary/Makefile 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/dependencies/Makefile 2008-03-26 14:09:11 UTC (rev 7391)
@@ -0,0 +1,24 @@
+SOURCEDIR=..\..\..\mugshot-dependencies\windows-binary
+
+all:
+ -mkdir $(OUTDIR)
+ copy $(SOURCEDIR)\COPYING.txt $(OUTDIR)\COPYING-LIBS.txt
+ copy $(SOURCEDIR)\charset.dll $(OUTDIR)
+ copy $(SOURCEDIR)\iconv.dll $(OUTDIR)
+ copy $(SOURCEDIR)\intl.dll $(OUTDIR)
+ copy $(SOURCEDIR)\jpeg62.dll $(OUTDIR)
+ copy $(SOURCEDIR)\libpng13.dll $(OUTDIR)
+ copy $(SOURCEDIR)\zlib1.dll $(OUTDIR)
+ -mkdir $(OUTDIR)\etc
+ -mkdir $(OUTDIR)\etc\pango
+ copy $(SOURCEDIR)\pango\etc\pango\pango.aliases $(OUTDIR)\etc\pango
+
+clean:
+ -del $(OUTDIR)\COPYING-LIBS.txt
+ -del $(OUTDIR)\charset.dll
+ -del $(OUTDIR)\iconv.dll
+ -del $(OUTDIR)\intl.dll
+ -del $(OUTDIR)\jpeg62.dll
+ -del $(OUTDIR)\libpng13.dll
+ -del $(OUTDIR)\zlib1.dll
+ -rmdir /q /s $(OUTDIR)\etc
Copied: mugshot-client/trunk/windows/dependencies/dependencies.vcproj (from rev 7390, mugshot-dependencies/trunk/windows-binary/dependencies.vcproj)
===================================================================
--- mugshot-dependencies/trunk/windows-binary/dependencies.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/dependencies/dependencies.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="dependencies"
+ ProjectGUID="{923DC368-46A9-4977-B827-75797CC259E3}"
+ RootNamespace="dependencies"
+ Keyword="MakeFileProj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="0"
+ InheritedPropertySheets="..\Sheets\HippoMake.vsprops"
+ >
+ <Tool
+ Name="VCNMakeTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="0"
+ InheritedPropertySheets="..\Sheets\HippoMake.vsprops"
+ >
+ <Tool
+ Name="VCNMakeTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath=".\Makefile"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: mugshot-client/trunk/windows/libddm/libddm.vsprops
===================================================================
--- mugshot-client/trunk/windows/libddm/libddm.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libddm/libddm.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../HippoUtil;../../common/glib;../../common/glib/glib;../libglib;../dependencies/gettext/include;../../common;"../../../desktop-data-model""
+ AdditionalIncludeDirectories=".;../HippoUtil;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../mugshot-dependencies/windows-binary/gettext/include;../../common;"../../../desktop-data-model""
PreprocessorDefinitions="DDM_COMPILATION"
DisableSpecificWarnings="4311;4244;4267"
/>
Modified: mugshot-client/trunk/windows/libglib/libglib.vcproj
===================================================================
--- mugshot-client/trunk/windows/libglib/libglib.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libglib/libglib.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -153,7 +153,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\glib\glib\gnulib\asnprintf.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\asnprintf.c"
>
</File>
<File
@@ -161,239 +161,239 @@
>
</File>
<File
- RelativePath="..\..\common\glib\glib\galiasdef.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\galiasdef.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\garray.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\garray.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gasyncqueue.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gasyncqueue.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gatomic.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gatomic.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gbacktrace.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gbacktrace.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gbase64.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gbase64.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gbookmarkfile.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gbookmarkfile.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gcache.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gcache.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gcompletion.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gcompletion.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gconvert.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gconvert.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gdataset.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gdataset.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gdate.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gdate.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gdir.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gdir.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gerror.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gerror.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gfileutils.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gfileutils.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\ghash.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\ghash.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\ghook.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\ghook.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\giochannel.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\giochannel.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\giowin32.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\giowin32.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gkeyfile.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gkeyfile.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\glist.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\glist.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmain.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmain.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmappedfile.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmappedfile.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmarkup.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmarkup.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmem.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmem.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmessages.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmessages.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnode.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnode.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\goption.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\goption.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gpattern.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gpattern.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gprimes.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gprimes.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gprintf.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gprintf.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gqsort.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gqsort.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gqueue.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gqueue.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\grand.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\grand.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\grel.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\grel.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gscanner.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gscanner.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gshell.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gshell.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gslice.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gslice.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gslist.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gslist.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gspawn-win32.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gspawn-win32.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gstdio.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gstdio.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gstrfuncs.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gstrfuncs.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gstring.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gstring.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gthread.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gthread.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gthreadpool.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gthreadpool.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gtimer.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gtimer.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gtree.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gtree.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunibreak.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunibreak.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunicollate.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunicollate.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunidecomp.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunidecomp.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\guniprop.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\guniprop.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gutf8.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gutf8.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gutils.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gutils.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gwin32.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gwin32.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\libcharset\localcharset.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\libcharset\localcharset.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\printf-args.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\printf-args.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\printf-parse.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\printf-parse.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\printf.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\printf.c"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\vasnprintf.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\vasnprintf.c"
>
</File>
<File
@@ -407,7 +407,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\common\glib\config.h.win32"
+ RelativePath="..\..\..\mugshot-dependencies\glib\config.h.win32"
>
<FileConfiguration
Name="Debug|Win32"
@@ -435,119 +435,119 @@
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\g-gnulib.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\g-gnulib.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\galias.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\galias.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\galloca.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\galloca.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\garray.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\garray.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gasyncqueue.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gasyncqueue.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gatomic.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gatomic.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gbacktrace.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gbacktrace.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gbase64.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gbase64.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gbookmarkfile.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gbookmarkfile.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gbsearcharray.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gbsearcharray.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gcache.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gcache.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gcompletion.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gcompletion.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gconvert.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gconvert.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gdataset.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gdataset.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gdatasetprivate.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gdatasetprivate.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gdate.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gdate.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gdebug.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gdebug.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gdir.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gdir.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gerror.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gerror.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gfileutils.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gfileutils.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\ghash.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\ghash.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\ghook.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\ghook.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gi18n-lib.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gi18n-lib.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gi18n.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gi18n.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\giochannel.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\giochannel.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gkeyfile.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gkeyfile.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\glib-object.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\glib-object.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\glib.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\glib.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glibconfig.h.win32"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glibconfig.h.win32"
>
<FileConfiguration
Name="Debug|Win32"
@@ -571,191 +571,191 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\common\glib\glib\glibintl.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\glibintl.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\glist.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\glist.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmacros.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmacros.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmain.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmain.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmappedfile.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmappedfile.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmarkup.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmarkup.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmem.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmem.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmessages.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmessages.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gmirroringtable.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gmirroringtable.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnode.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnode.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\goption.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\goption.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gpattern.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gpattern.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gprimes.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gprimes.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gprintf.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gprintf.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gprintfint.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gprintfint.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gqsort.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gqsort.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gquark.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gquark.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gqueue.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gqueue.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\grand.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\grand.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\grel.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\grel.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gscanner.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gscanner.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gshell.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gshell.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gslice.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gslice.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gslist.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gslist.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gspawn.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gspawn.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gstdio.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gstdio.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gstrfuncs.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gstrfuncs.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gstring.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gstring.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gthread.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gthread.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gthreadpool.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gthreadpool.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gthreadprivate.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gthreadprivate.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gtimer.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gtimer.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gtree.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gtree.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gtypes.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gtypes.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunibreak.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunibreak.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunichartables.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunichartables.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunicode.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunicode.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunicodeprivate.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunicodeprivate.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunicomp.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunicomp.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gunidecomp.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gunidecomp.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gutils.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gutils.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gwin32.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gwin32.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\libcharset\libcharset.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\libcharset\libcharset.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\printf-args.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\printf-args.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\printf-parse.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\printf-parse.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\printf.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\printf.h"
>
</File>
<File
- RelativePath="..\..\common\glib\glib\gnulib\vasnprintf.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\gnulib\vasnprintf.h"
>
</File>
</Filter>
@@ -765,7 +765,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\..\common\glib\glib\glib.rc"
+ RelativePath="..\..\..\mugshot-dependencies\glib\glib\glib.rc"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/libglib/libglib.vsprops
===================================================================
--- mugshot-client/trunk/windows/libglib/libglib.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libglib/libglib.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;..\..\common\glib;..\..\common\glib\glib;..\dependencies\gettext\include;..\dependencies\libiconv\include"
+ AdditionalIncludeDirectories=".;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\mugshot-dependencies\windows-binary\gettext\include;..\..\mugshot-dependencies\windows-binary\libiconv\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GLIB_COMPILATION"
DisableSpecificWarnings="4018;4244;4267;4311;4312"
/>
@@ -14,7 +14,7 @@
Name="VCLinkerTool"
AdditionalDependencies="iconv.lib intl.lib ws2_32.lib"
OutputFile="$(OutDir)\libglib-2.0-0.dll"
- AdditionalLibraryDirectories="..\dependencies\libiconv\lib\;..\dependencies\gettext\lib\"
+ AdditionalLibraryDirectories="..\..\mugshot-dependencies\windows-binary\libiconv\lib\;..\..\mugshot-dependencies\windows-binary\gettext\lib\"
ModuleDefinitionFile="glib.def"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/libgmodule/libgmodule.vcproj
===================================================================
--- mugshot-client/trunk/windows/libgmodule/libgmodule.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libgmodule/libgmodule.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -152,7 +152,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\glib\gmodule\gmodule.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gmodule\gmodule.c"
>
</File>
</Filter>
@@ -162,11 +162,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\common\glib\gmodule\gmodule.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gmodule\gmodule.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gmodule\gmoduleconf.h.win32"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gmodule\gmoduleconf.h.win32"
>
<FileConfiguration
Name="Debug|Win32"
@@ -196,7 +196,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\..\common\glib\gmodule\gmodule.rc"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gmodule\gmodule.rc"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/libgmodule/libgmodule.vsprops
===================================================================
--- mugshot-client/trunk/windows/libgmodule/libgmodule.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libgmodule/libgmodule.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,13 +6,13 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;..\libglib;..\..\common\glib;..\..\common\glib\glib;..\dependencies\gettext\include;..\dependencies\libiconv\include"
+ AdditionalIncludeDirectories=".;..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\mugshot-dependencies\windows-binary\gettext\include;..\..\mugshot-dependencies\windows-binary\libiconv\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GMODULE_COMPILATION"
DisableSpecificWarnings="4312;4267"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libgmodule-2.0-0.dll"
- ModuleDefinitionFile="..\..\common\glib\gmodule\gmodule.def"
+ ModuleDefinitionFile="..\..\..\mugshot-dependencies\glib\gmodule\gmodule.def"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/libgobject/libgobject.vcproj
===================================================================
--- mugshot-client/trunk/windows/libgobject/libgobject.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libgobject/libgobject.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -152,75 +152,75 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\glib\gobject\gboxed.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gboxed.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gclosure.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gclosure.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\genums.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\genums.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gobject-query.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gobject-query.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gobject.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gobject.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gobjectaliasdef.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gobjectaliasdef.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gobjectnotifyqueue.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gobjectnotifyqueue.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gparam.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gparam.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gparamspecs.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gparamspecs.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gsignal.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gsignal.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gsourceclosure.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gsourceclosure.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gtype.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gtype.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gtypemodule.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gtypemodule.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gtypeplugin.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gtypeplugin.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gvalue.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gvalue.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gvaluearray.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gvaluearray.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gvaluetransform.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gvaluetransform.c"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gvaluetypes.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gvaluetypes.c"
>
</File>
</Filter>
@@ -230,71 +230,71 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\common\glib\gobject\gboxed.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gboxed.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gclosure.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gclosure.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\genums.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\genums.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gmarshal.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gmarshal.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gobject.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gobject.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gobjectalias.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gobjectalias.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gparam.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gparam.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gparamspecs.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gparamspecs.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gsignal.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gsignal.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gsourceclosure.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gsourceclosure.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gtype.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gtype.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gtypemodule.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gtypemodule.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gtypeplugin.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gtypeplugin.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gvalue.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gvalue.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gvaluearray.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gvaluearray.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gvaluecollector.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gvaluecollector.h"
>
</File>
<File
- RelativePath="..\..\common\glib\gobject\gvaluetypes.h"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gvaluetypes.h"
>
</File>
</Filter>
@@ -304,7 +304,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\..\common\glib\gobject\gobject.rc"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gobject\gobject.rc"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/libgobject/libgobject.vsprops
===================================================================
--- mugshot-client/trunk/windows/libgobject/libgobject.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libgobject/libgobject.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\libglib\debug;..\libglib;..\..\common\glib;..\..\common\glib\glib;..\dependencies\gettext\include"
+ AdditionalIncludeDirectories="..\libglib\debug;..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\mugshot-dependencies\windows-binary\gettext\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GOBJECT_COMPILATION"
DisableSpecificWarnings="4018;4244;4267;4311;4312"
/>
Modified: mugshot-client/trunk/windows/libgthread/libgthread.vcproj
===================================================================
--- mugshot-client/trunk/windows/libgthread/libgthread.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libgthread/libgthread.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -152,7 +152,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\glib\gthread\gthread-impl.c"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gthread\gthread-impl.c"
>
</File>
</Filter>
@@ -168,7 +168,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\..\common\glib\gthread\gthread.rc"
+ RelativePath="..\..\..\mugshot-dependencies\glib\gthread\gthread.rc"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/libgthread/libgthread.vsprops
===================================================================
--- mugshot-client/trunk/windows/libgthread/libgthread.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libgthread/libgthread.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,13 +6,13 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="..\libglib;..\..\common\glib;..\..\common\glib\glib;..\dependencies\gettext\include"
+ AdditionalIncludeDirectories="..\libglib;..\..\..\mugshot-dependencies\glib;..\..\..\mugshot-dependencies\glib\glib;..\..\mugshot-dependencies\windows-binary\gettext\include"
PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;GMODULE_COMPILATION"
DisableSpecificWarnings="4311;4312"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libgthread-2.0-0.dll"
- ModuleDefinitionFile="..\..\common\glib\gthread\gthread.def"
+ ModuleDefinitionFile="..\..\..\mugshot-dependencies\glib\gthread\gthread.def"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/libpango/libpango.vcproj
===================================================================
--- mugshot-client/trunk/windows/libpango/libpango.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libpango/libpango.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -153,119 +153,119 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\pango\pango\break.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\break.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\ellipsize.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\ellipsize.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\fonts.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\fonts.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\mini-fribidi\fribidi.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\mini-fribidi\fribidi.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\mini-fribidi\fribidi_char_type.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\mini-fribidi\fribidi_char_type.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\mini-fribidi\fribidi_types.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\mini-fribidi\fribidi_types.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\glyphstring.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\glyphstring.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\mapping.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\mapping.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\module-defs-lang.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\module-defs-lang.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\modules.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\modules.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-attributes.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-attributes.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-color.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-color.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-context.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-context.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-coverage.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-coverage.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-engine.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-engine.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-enum-types.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-enum-types.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-fontmap.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-fontmap.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-fontset.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-fontset.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-glyph-item.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-glyph-item.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-item.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-item.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-layout.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-layout.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-markup.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-markup.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-matrix.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-matrix.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-renderer.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-renderer.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-script.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-script.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-tabs.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-tabs.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-utils.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-utils.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\reorder-items.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\reorder-items.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\shape.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\shape.c"
>
</File>
</Filter>
@@ -279,131 +279,131 @@
>
</File>
<File
- RelativePath="..\..\common\pango\pango\mini-fribidi\fribidi.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\mini-fribidi\fribidi.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\mini-fribidi\fribidi_config.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\mini-fribidi\fribidi_config.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\mini-fribidi\fribidi_types.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\mini-fribidi\fribidi_types.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\module-defs.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\module-defs.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\modules.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\modules.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-attributes.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-attributes.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-break.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-break.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-color-table.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-color-table.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-context.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-context.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-coverage.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-coverage.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-engine-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-engine-private.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-engine.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-engine.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-enum-types.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-enum-types.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-font.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-font.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-fontmap.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-fontmap.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-fontset.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-fontset.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-glyph-item-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-glyph-item-private.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-glyph-item.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-glyph-item.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-glyph.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-glyph.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-impl-utils.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-impl-utils.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-item.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-item.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-layout-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-layout-private.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-layout.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-layout.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-modules.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-modules.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-renderer.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-renderer.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-script-lang-table.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-script-lang-table.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-script-table.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-script-table.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-script.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-script.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-tabs.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-tabs.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-types.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-types.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango-utils.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango-utils.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pango.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango.h"
>
</File>
</Filter>
@@ -413,7 +413,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\..\common\pango\pango\pango.rc"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pango.rc"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/libpango/libpango.vsprops
===================================================================
--- mugshot-client/trunk/windows/libpango/libpango.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libpango/libpango.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,13 +6,13 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../dependencies/gettext/include;../../common/glib;../../common/glib/glib;../libglib;../../common/glib/gmodule;../../common/pango/pango;../../common/pango"
+ AdditionalIncludeDirectories=".;../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
PreprocessorDefinitions="PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE"
DisableSpecificWarnings="4312;4244;4267"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libpango-1.0-0.dll"
- ModuleDefinitionFile="..\..\common\pango\pango\pango.def"
+ ModuleDefinitionFile="..\..\..\mugshot-dependencies\pango\pango\pango.def"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/libpangocairo/libpangocairo.vcproj
===================================================================
--- mugshot-client/trunk/windows/libpangocairo/libpangocairo.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libpangocairo/libpangocairo.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -153,23 +153,23 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\pango\pango\pangocairo-font.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangocairo-font.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangocairo-fontmap.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangocairo-fontmap.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangocairo-render.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangocairo-render.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangocairo-win32font.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangocairo-win32font.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangocairo-win32fontmap.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangocairo-win32fontmap.c"
>
</File>
</Filter>
@@ -179,15 +179,15 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\common\pango\pango\pangocairo-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangocairo-private.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangocairo-win32.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangocairo-win32.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangocairo.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangocairo.h"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/libpangocairo/libpangocairo.vsprops
===================================================================
--- mugshot-client/trunk/windows/libpangocairo/libpangocairo.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libpangocairo/libpangocairo.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,13 +6,13 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../libpango;../dependencies/gettext/include;../../common/glib;../../common/glib/glib;../libglib;../cairo;../../common/cairo/src;../../common/glib/gmodule;../../common/pango/pango;../../common/pango"
+ AdditionalIncludeDirectories="../libpango;../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../cairo;../../../mugshot-dependencies/cairo/src;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
PreprocessorDefinitions="PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE"
DisableSpecificWarnings="4312;4244"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libpangocairo-1.0-0.dll"
- ModuleDefinitionFile="../../common/pango/pango/pangocairo.def"
+ ModuleDefinitionFile="../../../mugshot-dependencies/pango/pango/pangocairo.def"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/libpangowin32/libpangowin32.vcproj
===================================================================
--- mugshot-client/trunk/windows/libpangowin32/libpangowin32.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libpangowin32/libpangowin32.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -153,7 +153,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\pango\modules\basic\basic-win32.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\modules\basic\basic-win32.c"
>
<FileConfiguration
Name="Debug|Win32"
@@ -177,15 +177,15 @@
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangowin32-fontcache.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangowin32-fontcache.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangowin32-fontmap.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangowin32-fontmap.c"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangowin32.c"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangowin32.c"
>
</File>
</Filter>
@@ -195,11 +195,11 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\common\pango\pango\pangowin32-private.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangowin32-private.h"
>
</File>
<File
- RelativePath="..\..\common\pango\pango\pangowin32.h"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangowin32.h"
>
</File>
</Filter>
@@ -209,7 +209,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
- RelativePath="..\..\common\pango\pango\pangowin32.rc"
+ RelativePath="..\..\..\mugshot-dependencies\pango\pango\pangowin32.rc"
>
</File>
</Filter>
Modified: mugshot-client/trunk/windows/libpangowin32/libpangowin32.vsprops
===================================================================
--- mugshot-client/trunk/windows/libpangowin32/libpangowin32.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/libpangowin32/libpangowin32.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,13 +6,13 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../libpango;../dependencies/gettext/include;../../common/glib;../../common/glib/glib;../libglib;../../common/glib/gmodule;../../common/pango/pango;../../common/pango"
+ AdditionalIncludeDirectories="../libpango;../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/glib/gmodule;../../../mugshot-dependencies/pango/pango;../../../mugshot-dependencies/pango"
PreprocessorDefinitions="PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
DisableSpecificWarnings="4312;4244;4267"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\libpangowin32-1.0-0.dll"
- ModuleDefinitionFile="../../common/pango/pango/pangowin32.def"
+ ModuleDefinitionFile="../../../mugshot-dependencies/pango/pango/pangowin32.def"
/>
</VisualStudioPropertySheet>
Modified: mugshot-client/trunk/windows/loudmouth/loudmouth.vcproj
===================================================================
--- mugshot-client/trunk/windows/loudmouth/loudmouth.vcproj 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/loudmouth/loudmouth.vcproj 2008-03-26 14:09:11 UTC (rev 7391)
@@ -153,51 +153,51 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-connection.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-connection.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-debug.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-debug.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-error.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-error.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-message-handler.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-message-handler.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-message-node.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-message-node.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-message.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-message.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-parser.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-parser.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-proxy.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-proxy.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-sha.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-sha.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-ssl.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-ssl.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-utils.c"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-utils.c"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\loudmouth.def"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\loudmouth.def"
>
</File>
</Filter>
@@ -207,59 +207,59 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-connection.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-connection.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-debug.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-debug.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-error.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-error.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-internals.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-internals.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-message-handler.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-message-handler.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-message-node.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-message-node.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-message.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-message.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-parser.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-parser.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-proxy.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-proxy.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-sha.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-sha.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-ssl.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-ssl.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\lm-utils.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\lm-utils.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\loudmouth\loudmouth.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\loudmouth\loudmouth.h"
>
</File>
<File
- RelativePath="..\..\common\loudmouth\win32-config.h"
+ RelativePath="..\..\..\mugshot-dependencies\loudmouth\win32-config.h"
>
<FileConfiguration
Name="Debug|Win32"
Modified: mugshot-client/trunk/windows/loudmouth/loudmouth.vsprops
===================================================================
--- mugshot-client/trunk/windows/loudmouth/loudmouth.vsprops 2008-03-26 13:36:33 UTC (rev 7390)
+++ mugshot-client/trunk/windows/loudmouth/loudmouth.vsprops 2008-03-26 14:09:11 UTC (rev 7391)
@@ -6,7 +6,7 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;../dependencies/gettext/include;../../common/glib;../../common/glib/glib;../libglib;../../common/loudmouth"
+ AdditionalIncludeDirectories=".;../../mugshot-dependencies/windows-binary/gettext/include;../../../mugshot-dependencies/glib;../../../mugshot-dependencies/glib/glib;../libglib;../../../mugshot-dependencies/loudmouth"
PreprocessorDefinitions="__WIN32__;LM_COMPILATION;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE"
DisableSpecificWarnings="4244;4267"
/>
@@ -14,7 +14,7 @@
Name="VCLinkerTool"
AdditionalDependencies="intl.lib glib-2.0.lib ws2_32.lib"
OutputFile="$(OutDir)/loudmouth-1.dll"
- AdditionalLibraryDirectories="../dependencies/gettext/lib;../dependencies/glib/lib"
- ModuleDefinitionFile="../../common/loudmouth/loudmouth/loudmouth.def"
+ AdditionalLibraryDirectories="../../mugshot-dependencies/windows-binary/gettext/lib"
+ ModuleDefinitionFile="../../../mugshot-dependencies/loudmouth/loudmouth/loudmouth.def"
/>
</VisualStudioPropertySheet>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
