From 05b5738e6224aced1e1e97479a190d2a4903f581 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 18 Jun 2011 21:39:27 +0000 Subject: [PATCH] [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. svn path=/trunk/; revision=52350 --- reactos/cmake/msvc.cmake | 2 +- reactos/dll/win32/crtdll/CMakeLists.txt | 8 +++++--- reactos/importlibs/oldnames.lib | Bin 0 -> 84532 bytes 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 reactos/importlibs/oldnames.lib diff --git a/reactos/cmake/msvc.cmake b/reactos/cmake/msvc.cmake index ec286c8631c..5954b5b8c8a 100644 --- a/reactos/cmake/msvc.cmake +++ b/reactos/cmake/msvc.cmake @@ -29,7 +29,7 @@ else() 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 " /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 ") diff --git a/reactos/dll/win32/crtdll/CMakeLists.txt b/reactos/dll/win32/crtdll/CMakeLists.txt index 26fffe761ec..38fed08d65f 100644 --- a/reactos/dll/win32/crtdll/CMakeLists.txt +++ b/reactos/dll/win32/crtdll/CMakeLists.txt @@ -23,9 +23,11 @@ set_module_type(crtdll win32dll) set_entrypoint(crtdll DllMain@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) diff --git a/reactos/importlibs/oldnames.lib b/reactos/importlibs/oldnames.lib new file mode 100644 index 0000000000000000000000000000000000000000..00ffabe14d0914166df88f8d3b4d0ece0978a2df GIT binary patch literal 84532 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