[ros-diffs] [akhaldi] 52350: [CMAKE] * Temporarily add liboldnames.a, I mean, oldnames.lib, to the importlibs folder, until we get one for msvc. * Link crtdll to oldnames in msvc build.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Sat Jun 18 21:39:27 2011
New Revision: 52350

URL: http://svn.reactos.org/svn/reactos?rev=52350&view=rev
Log:
[CMAKE]
* Temporarily add liboldnames.a, I mean, oldnames.lib, to the importlibs folder, until we get one for msvc.
* Link crtdll to oldnames in msvc build.

Added:
    trunk/reactos/importlibs/oldnames.lib   (with props)
Modified:
    trunk/reactos/cmake/msvc.cmake
    trunk/reactos/dll/win32/crtdll/CMakeLists.txt

Modified: trunk/reactos/cmake/msvc.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52350&r1=52349&r2=52350&view=diff
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Jun 18 21:39:27 2011
@@ -29,7 +29,7 @@
     set(SPEC2DEF_ARCH i386)
 endif()
 
-link_directories("${REACTOS_BINARY_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/sdk/crt)
+link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt)
 
 set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>")
 

Modified: trunk/reactos/dll/win32/crtdll/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/CMakeLists.txt?rev=52350&r1=52349&r2=52350&view=diff
==============================================================================
--- trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Sat Jun 18 21:39:27 2011
@@ -23,9 +23,11 @@
 
 set_entrypoint(crtdll DllMain at 12)
 
-target_link_libraries(crtdll
-    wine
-    crt)
+target_link_libraries(crtdll wine crt)
+
+if(MSVC)
+    target_link_libraries(crtdll oldnames)
+endif()
 
 add_importlibs(crtdll kernel32 ntdll)
 add_pch(crtdll precomp.h)

Added: trunk/reactos/importlibs/oldnames.lib
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/oldnames.lib?rev=52350&view=auto
==============================================================================
Binary file - no diff available.

Propchange: trunk/reactos/importlibs/oldnames.lib
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream