Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[C++]

Browse source 
- Enable STLPort build on MSVC
- Configure STLPort not to generate static constant definitions (which MSVC doesn't like)
- Link C++ modules to stlport and cpprt as appropriate
- Fix comsupp and atl C++ options
CORE-6950

svn path=/trunk/; revision=59290
This commit is contained in:
Thomas Faber 2013-06-22 15:57:36 +00:00
parent 77ce0c5663
commit e9df952de3
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/cmake/msvc.cmake
View file

@ -112,7 +112,9 @@ function(set_module_type_toolchain MODULE TYPE)
if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL "wdmdriver")) if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL "wdmdriver"))
message(FATAL_ERROR "Use of STL in kernelmodedriver or wdmdriver type module prohibited") message(FATAL_ERROR "Use of STL in kernelmodedriver or wdmdriver type module prohibited")
endif() endif()
#target_link_libraries(${MODULE} stlport oldnames) target_link_libraries(${MODULE} cpprt stlport oldnames)
elseif(CPP_USE_RT)
target_link_libraries(${MODULE} cpprt)
endif() endif()
if((${TYPE} STREQUAL "win32dll") OR (${TYPE} STREQUAL "win32ocx") OR (${TYPE} STREQUAL "cpl")) if((${TYPE} STREQUAL "win32dll") OR (${TYPE} STREQUAL "win32ocx") OR (${TYPE} STREQUAL "cpl"))
add_target_link_flags(${MODULE} "/DLL") add_target_link_flags(${MODULE} "/DLL")

2
reactos/include/c++/stlport/stl/config/_reactos.h
View file

@ -214,7 +214,7 @@
// Uncomment to indicate that the compiler do not like static constant // Uncomment to indicate that the compiler do not like static constant
// definition. // definition.
// Meaningfull only if _STLP_STATIC_CONST_INIT_BUG is not defined. // Meaningfull only if _STLP_STATIC_CONST_INIT_BUG is not defined.
// # define _STLP_NO_STATIC_CONST_DEFINITION # define _STLP_NO_STATIC_CONST_DEFINITION
// Define if default constructor for builtin integer type fails to initialize it to 0 // Define if default constructor for builtin integer type fails to initialize it to 0
// In expression like new(&char) char(): // In expression like new(&char) char():

4
reactos/lib/3rdparty/CMakeLists.txt vendored
View file

@ -9,6 +9,8 @@ add_subdirectory(libmpg123)
add_subdirectory(libsamplerate) add_subdirectory(libsamplerate)
add_subdirectory(libwine) add_subdirectory(libwine)
add_subdirectory(libxml2) add_subdirectory(libxml2)
# add_subdirectory(stlport) FIXME: Add proper STL support if(MSVC)
add_subdirectory(stlport)
endif()
add_subdirectory(strmbase) add_subdirectory(strmbase)
add_subdirectory(zlib) add_subdirectory(zlib)

4
reactos/lib/3rdparty/stlport/CMakeLists.txt vendored
View file

@ -2,13 +2,13 @@
#uncomment this if you want to test c++ compilation #uncomment this if you want to test c++ compilation
#add_subdirectory(test) #add_subdirectory(test)
set_cpp(WITH_RTTI WITH_EXCEPTIONS WITH_STL)
add_definitions( add_definitions(
-D_STLP_USE_EXCEPTIONS -D_STLP_USE_EXCEPTIONS
-D_DLL -D__USE_CRTIMP -D_DLL -D__USE_CRTIMP
-D_BUILD_STLPORT) -D_BUILD_STLPORT)
set_cpp()
list(APPEND SOURCE list(APPEND SOURCE
src/allocators.cpp src/allocators.cpp
src/bitset.cpp src/bitset.cpp

2
reactos/lib/atl/CMakeLists.txt
View file

@ -1,7 +1,5 @@
if(NOT MSVC)
set_cpp(WITH_RTTI) set_cpp(WITH_RTTI)
endif()
add_definitions( add_definitions(
-DUNICODE -D_UNICODE -DUNICODE -D_UNICODE

2
reactos/lib/sdk/comsupp/CMakeLists.txt
View file

@ -1,5 +1,5 @@
set_cpp(WITH_EXCEPTIONS) set_cpp(WITH_EXCEPTIONS WITH_STL)
add_library(comsupp comsupp.cpp) add_library(comsupp comsupp.cpp)
add_dependencies(comsupp psdk) add_dependencies(comsupp psdk)