mirror of
https://github.com/reactos/reactos.git
synced 2024-08-20 02:13:29 +00:00
[CMAKE]
- Use stlport specific includes only for c++ source files - remove linking to ntdll, kernel32 and oldnames for mingw_common svn path=/branches/cmake-bringup/; revision=49050
This commit is contained in:
parent
27267a3cab
commit
e20a0a30ee
|
@ -92,8 +92,6 @@ include_directories(include/ndk)
|
|||
include_directories(include/reactos)
|
||||
include_directories(include/reactos/libs)
|
||||
|
||||
include_directories(BEFORE lib/3rdparty/stlport/stlport)
|
||||
|
||||
add_subdirectory(include/psdk)
|
||||
add_subdirectory(include/dxsdk)
|
||||
add_subdirectory(include/reactos/idl)
|
||||
|
|
|
@ -17,6 +17,9 @@ set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-bas
|
|||
# Compiler Core
|
||||
add_definitions(-pipe -fms-extensions)
|
||||
|
||||
# stlport includes
|
||||
set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> -I${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport <FLAGS> -o <OBJECT> -c <SOURCE>")
|
||||
|
||||
set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
|
||||
|
||||
set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
|
||||
|
|
4
lib/3rdparty/mingw/CMakeLists.txt
vendored
4
lib/3rdparty/mingw/CMakeLists.txt
vendored
|
@ -42,8 +42,8 @@ add_library(mingw_common ${MINGW_COMMON_SOURCE})
|
|||
|
||||
if(NOT MSVC)
|
||||
target_link_libraries(mingw_common)
|
||||
add_importlibs(mingw_common kernel32 ntdll oldnames)
|
||||
add_dependencies(mingw_common oldnames)
|
||||
# add_importlibs(mingw_common kernel32 ntdll oldnames)
|
||||
# add_dependencies(mingw_common oldnames)
|
||||
endif(NOT MSVC)
|
||||
|
||||
set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)
|
||||
|
|
2
lib/3rdparty/stlport/CMakeLists.txt
vendored
2
lib/3rdparty/stlport/CMakeLists.txt
vendored
|
@ -4,6 +4,8 @@
|
|||
|
||||
add_definitions(-D_STLP_USE_EXCEPTIONS)
|
||||
|
||||
include_directories(BEFORE ./stlport)
|
||||
|
||||
list(APPEND SOURCE
|
||||
src/allocators.cpp
|
||||
src/bitset.cpp
|
||||
|
|
Loading…
Reference in a new issue