* configure.ac: win32 compilation fixes for the skins2 plugin.

* modules/gui/skins2/Modules.am: renamed the plugin name into skins2 so it doesn't conflict with the old plugin.
* modules/gui/skins2/vars/playlist.cpp: fixed invalid cast.

diff --git a/configure.ac b/configure.ac
index 1a5e3acef890ac32709ae6fbae69acdead3ce807..5d5a37bb376caa3a6a4571e007c6dd74b6803b8d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.144 2004/01/05 14:10:58 fenrir Exp $
+dnl $Id: configure.ac,v 1.145 2004/01/05 17:42:36 gbazin Exp $
 
 AC_INIT(vlc,0.7.1-cvs)
 
@@ -2745,17 +2745,23 @@ if test "${enable_skins2}" != "no"; then
 
     AX_ADD_PLUGINS([skins2])
     ALIASES="${ALIASES} svlc"
-    AX_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2])
+    AX_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
     AX_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
-    AX_ADD_LDFLAGS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32])
+    AX_ADD_LDFLAGS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32])
 
   else if test "${enable_skins2}" = "yes"; then
     AX_ADD_PLUGINS([skins2])
     ALIASES="${ALIASES} svlc"
-    AX_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -I${x_includes} -I/usr/include/freetype2 -DX11_SKINS])
+    AX_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -I${x_includes} -DX11_SKINS])
     AX_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
-    AX_ADD_LDFLAGS([skins2],[-L${x_libraries} -lXext -lX11 -lfreetype -lpng ])
+    AX_ADD_LDFLAGS([skins2],[-L${x_libraries} -lXext -lX11])
   fi fi
+
+  if test "${FREETYPE_CONFIG}" != "no"
+  then
+    AX_ADD_CPPFLAGS([skins2],[`${FREETYPE_CONFIG} --cflags` ${INCICONV}])
+    AX_ADD_LDFLAGS([skins2],[`${FREETYPE_CONFIG} --libs` ${LIBICONV} -lpng])
+  fi
 fi
 
 

diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am
index 3e631d4c623bd345371c1bfb31377752cd522be1..7920c0aceb5da45705ad4e1acbb241724c55b183 100644 (file)
--- a/modules/gui/skins2/Modules.am
+++ b/modules/gui/skins2/Modules.am
@@ -1,4 +1,4 @@
-SOURCES_skins = \
+SOURCES_skins2 = \
        commands/async_queue.cpp \
        commands/async_queue.hpp \
        commands/cmd_add_item.cpp \

diff --git a/modules/gui/skins2/vars/playlist.cpp b/modules/gui/skins2/vars/playlist.cpp
index 6ebd583dc754ac6d14a6323710ccd35284f81808..739e49897e43a24ad864044d8a3c900c75ccf1f7 100644 (file)
--- a/modules/gui/skins2/vars/playlist.cpp
+++ b/modules/gui/skins2/vars/playlist.cpp
@@ -2,7 +2,7 @@
  * playlist.cpp
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: playlist.cpp,v 1.2 2004/01/04 22:38:49 gbazin Exp $
+ * $Id: playlist.cpp,v 1.3 2004/01/05 17:42:36 gbazin Exp $
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *
@@ -157,8 +157,8 @@ UString *Playlist::convertName( const char *pName )
     pBufferIn = pName;
     inbytesLeft = strlen( pName );
     outbytesLeft = 6 * inbytesLeft;
-    ret = iconv( iconvHandle, (char**)&pBufferIn, &inbytesLeft, &pBufferOut,
-                 &outbytesLeft );
+    ret = iconv( iconvHandle, (const char**)&pBufferIn, &inbytesLeft,
+                 &pBufferOut, &outbytesLeft );
     *pBufferOut = '\0';
 
     if( inbytesLeft )