Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 05:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2011-06-18 21:39:27 +00:00
parent 7f85f59d7a
commit 05b5738e62
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/cmake/msvc.cmake
View file

@ -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 "<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>")

8
reactos/dll/win32/crtdll/CMakeLists.txt
View file

@ -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)

BIN
reactos/importlibs/oldnames.lib Normal file
View file

Binary file not shown.