[ros-diffs] [jgardou] 49050: [CMAKE] - Use stlport specific includes only for c++ source files - remove linking to ntdll, kernel32 and oldnames for mingw_common

jgardou at svn.reactos.org jgardou at svn.reactos.org
Fri Oct 8 13:47:40 UTC 2010


Author: jgardou
Date: Fri Oct  8 13:47:39 2010
New Revision: 49050

URL: http://svn.reactos.org/svn/reactos?rev=49050&view=rev
Log:
[CMAKE]
  - Use stlport specific includes only for c++ source files
  - remove linking to ntdll, kernel32 and oldnames for mingw_common

Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
    branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=49050&r1=49049&r2=49050&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Fri Oct  8 13:47:39 2010
@@ -92,8 +92,6 @@
 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)

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=49050&r1=49049&r2=49050&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Oct  8 13:47:39 2010
@@ -16,6 +16,9 @@
 
 # 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>")
 

Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt?rev=49050&r1=49049&r2=49050&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Fri Oct  8 13:47:39 2010
@@ -42,8 +42,8 @@
 
 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)

Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt?rev=49050&r1=49049&r2=49050&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Fri Oct  8 13:47:39 2010
@@ -3,6 +3,8 @@
 #add_subdirectory(test)
 
 add_definitions(-D_STLP_USE_EXCEPTIONS)
+
+include_directories(BEFORE ./stlport)
 
 list(APPEND SOURCE
   src/allocators.cpp




More information about the Ros-diffs mailing list