Author: akhaldi Date: Wed Sep 26 19:38:42 2012 New Revision: 57395
URL: http://svn.reactos.org/svn/reactos?rev=57395&view=rev Log: * Revert r57394 as per Mike's request.
Removed: trunk/reactos/lib/3rdparty/libwin-iconv/ Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt
Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/CMakeLists.txt... ============================================================================== --- trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] Wed Sep 26 19:38:42 2012 @@ -8,7 +8,6 @@ add_subdirectory(libmpg123) add_subdirectory(libsamplerate) add_subdirectory(libwine) -add_subdirectory(libwin-iconv) add_subdirectory(libxml2) # add_subdirectory(stlport) FIXME: Add proper STL support add_subdirectory(zlib)
Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/CMakeL... ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Wed Sep 26 19:38:42 2012 @@ -1,7 +1,5 @@
-include_directories( - include - ${REACTOS_SOURCE_DIR}/lib/3rdparty/libwin-iconv) +include_directories(include)
add_definitions( -D__MINGW32__ @@ -12,8 +10,6 @@ -D_WINDOWS -DWIN32 -DHAVE_CONFIG_H - -DLIBXML_ICONV_ENABLED - -DICONV_CONST=const -D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE