[jgardou] 49619: [CMAKE] - Improve browseui CMakeLists.txt - remove stdc++ dependancy to portcls - improve stlport header hack

Author: jgardou
Date: Fri Nov 19 09:53:49 2010
New Revision: 49619

URL: http://svn.reactos.org/svn/reactos?rev=49619&view=rev
Log:
[CMAKE]
  - Improve browseui CMakeLists.txt
  - remove stdc++ dependancy to portcls
  - improve stlport header hack

Modified:
    branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt
    branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
    branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h

Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseui...
==============================================================================
--- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Nov 19 09:53:49 2010
@@ -1,9 +1,9 @@

set_unicode()
+set_cpp()

add_definitions(
     -D__WINESRC__
-    -DUNICODE -D_UNICODE
     -DROS_Headers)

remove_definitions(-D_WIN32_WINNT=0x502)
@@ -40,8 +40,6 @@

set_module_type(browseui win32dll)

-target_link_libraries(browseui stlport -lsupc++ -lgcc)
-
 target_link_libraries(browseui
     atlnew
     uuid

Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/...
==============================================================================
--- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Fri Nov 19 09:53:49 2010
@@ -1,3 +1,5 @@
+
+set_cpp()

remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
@@ -51,11 +53,13 @@

target_link_libraries(portcls
     libcntpr
+    stlport
     ${PSEH_LIB})

if(MSVC)
     set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-")
 else()
+    target_link_libraries(portcls -lgcc)
     set_target_properties(portcls PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
 endif(MSVC)

@@ -64,6 +68,6 @@
 set_subsystem(portcls native)
 set_target_properties(portcls PROPERTIES SUFFIX ".sys")

-add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt)
+add_importlibs(portcls ntoskrnl ks drmk hal msvcrt)

add_cab_target(portcls 2)

Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/st...
==============================================================================
--- branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] (original)
+++ branches/cmake-bringup/include/c++/stlport/stl/config/_windows.h [iso-8859-1] Fri Nov 19 09:53:49 2010
@@ -44,7 +44,7 @@
 #  endif
 #endif /* _STLP_BIG_ENDIAN */

-#if !defined (_STLP_WINDOWS_H_INCLUDED) && !defined(_WDMDDK_) //let's hope it will work long enough...
+#if !defined (_STLP_WINDOWS_H_INCLUDED)
 #  define _STLP_WINDOWS_H_INCLUDED
 #  if defined (__BUILDING_STLPORT)
 #    include <stl/config/_native_headers.h>
@@ -94,7 +94,7 @@
 #      endif
 #    endif

-#    if defined (_STLP_NEW_PLATFORM_SDK)
+#    if defined (_STLP_NEW_PLATFORM_SDK) && !defined(_WDMDDK_)
 #      include <windef.h>
 _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedIncrement(IN OUT LONG volatile *);
 _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedDecrement(IN OUT LONG volatile *);
@@ -198,7 +198,7 @@
  * to avoid macro definition conflict. */
 #  if !defined (_WIN64)
 /* Under 32 bits platform we rely on a simple InterlockedExchange call. */
-#    if defined (__cplusplus)
+#    if defined (__cplusplus) && defined(__BUILDING_STLPORT)
 /* We do not define this function if we are not in a C++ translation unit just
  * because of the 'inline' keyword portability issue it would introduce. We will
  * have to fix it the day we need this function for a C translation unit.