[CMAKE]

- Improve browseui CMakeLists.txt
  - remove stdc++ dependancy to portcls
  - improve stlport header hack

svn path=/branches/cmake-bringup/; revision=49619

dll/win32/browseui/CMakeLists.txt

@@ -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 @@ add_library(browseui SHARED
 
 set_module_type(browseui win32dll)
 
-target_link_libraries(browseui stlport -lsupc++ -lgcc)
-
 target_link_libraries(browseui
     atlnew
     uuid

drivers/wdm/audio/backpln/portcls/CMakeLists.txt

@@ -1,4 +1,6 @@
 
+set_cpp()
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
@@ -51,11 +53,13 @@ add_library(portcls SHARED
 
 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_image_base(portcls 0x00010000)
 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)

include/c++/stlport/stl/config/_windows.h

@@ -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 @@ extern "C" {
 #      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 @@ _STLP_IMPORT_DECLSPEC void _STLP_STDCALL OutputDebugStringA(const char* lpOutput
  * 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.