win32/: win32 build fixes

Original commit message from CVS:

patch by: Sebastien Moutte

* win32/MANIFEST:
* win32/common/config.h.in:
* win32/vs6/libgstcontroller.dsp:
win32 build fixes

diff --git a/ChangeLog b/ChangeLog
index 7d147dea6cfc4aba49ecca906cef3f5e251f674a..d3b243556fb04309c8d37342ad049134308b315f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       patch by: Sebastien Moutte
+
+       * win32/MANIFEST:
+       * win32/common/config.h.in:
+       * win32/vs6/libgstcontroller.dsp:
+         win32 build fixes
+
 2005-12-05  Wim Taymans  <wim@fluendo.com>
 
        * gst/gstcaps.c: (gst_caps_is_equal):

diff --git a/win32/MANIFEST b/win32/MANIFEST
index 954605a8386906590812aac703ba8d37f04fed97..c6ac46839e77765d066a05f122cf38a20a437f0e 100644 (file)
--- a/win32/MANIFEST
+++ b/win32/MANIFEST
@@ -5,6 +5,7 @@ win32/common/config.h
 win32/common/dirent.h
 win32/common/gtchar.h
 win32/common/libgstbase.def
+win32/common/libgstcontroller.def
 win32/common/libgstreamer.def
 win32/common/gstenumtypes.c
 win32/common/gstconfig.h

diff --git a/win32/common/config.h.in b/win32/common/config.h.in
index befb4dfb21cb2c80640a961e15ebf591312221b0..14b6fcfd69969f35f35c9e8097363109d29bb6b5 100644 (file)
--- a/win32/common/config.h.in
+++ b/win32/common/config.h.in
@@ -172,7 +172,11 @@
 #define HAVE_WIN32 1
 
 /* library dir */
-#define LIBDIR PREFIX "\\lib"
+#ifdef _DEBUG
+#  define LIBDIR PREFIX "\\debug\\lib"
+#else
+#  define LIBDIR PREFIX "\\lib"
+#endif
 
 /* gettext locale dir */
 #define LOCALEDIR PREFIX "\\share\\locale"
@@ -196,7 +200,11 @@
 #undef PACKAGE_VERSION
 
 /* Define the plugin directory */
-#define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10"
+#ifdef _DEBUG
+#  define PLUGINDIR PREFIX "\\debug\\lib\\gstreamer-0.10"
+#else
+#  define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10"
+#endif
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS

diff --git a/win32/vs6/libgstcontroller.dsp b/win32/vs6/libgstcontroller.dsp
index c34ab241fd5dd09489b718e88a05e01ac7693e1b..8dd6a12f46d2754ccb718e2a97bcd977b6102398 100644 (file)
--- a/win32/vs6/libgstcontroller.dsp
+++ b/win32/vs6/libgstcontroller.dsp
@@ -108,6 +108,10 @@ SOURCE=..\..\libs\gst\controller\gstinterpolation.c
 
 SOURCE=..\..\libs\gst\controller\lib.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\common\libgstcontroller.def
+# End Source File
 # End Group
 # Begin Group "Header Files"