Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-25 23:39:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

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

svn path=/branches/cmake-bringup/; revision=49619
This commit is contained in:
Jérôme Gardou 2010-11-19 09:53:49 +00:00
parent d738b24b6f
commit 13aeeacdb3
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/browseui/CMakeLists.txt
View file

@ -1,9 +1,9 @@
set_unicode() set_unicode()
set_cpp()
add_definitions( add_definitions(
-D__WINESRC__ -D__WINESRC__
-DUNICODE -D_UNICODE
-DROS_Headers) -DROS_Headers)
remove_definitions(-D_WIN32_WINNT=0x502) remove_definitions(-D_WIN32_WINNT=0x502)
@ -40,8 +40,6 @@ add_library(browseui SHARED
set_module_type(browseui win32dll) set_module_type(browseui win32dll)
target_link_libraries(browseui stlport -lsupc++ -lgcc)
target_link_libraries(browseui target_link_libraries(browseui
atlnew atlnew
uuid uuid

6
drivers/wdm/audio/backpln/portcls/CMakeLists.txt
View file

@ -1,4 +1,6 @@
set_cpp()
remove_definitions(-D_WIN32_WINNT=0x502) remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_WIN32_WINNT=0x600)
@ -51,11 +53,13 @@ add_library(portcls SHARED
target_link_libraries(portcls target_link_libraries(portcls
libcntpr libcntpr
stlport
${PSEH_LIB}) ${PSEH_LIB})
if(MSVC) if(MSVC)
set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-") set_target_properties(portcls PROPERTIES COMPILE_FLAGS "/GR-")
else() else()
target_link_libraries(portcls -lgcc)
set_target_properties(portcls PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") set_target_properties(portcls PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti")
endif(MSVC) endif(MSVC)
@ -64,6 +68,6 @@ set_image_base(portcls 0x00010000)
set_subsystem(portcls native) set_subsystem(portcls native)
set_target_properties(portcls PROPERTIES SUFFIX ".sys") 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) add_cab_target(portcls 2)

6
include/c++/stlport/stl/config/_windows.h
View file

@ -44,7 +44,7 @@
# endif # endif
#endif /* _STLP_BIG_ENDIAN */ #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 # define _STLP_WINDOWS_H_INCLUDED
# if defined (__BUILDING_STLPORT) # if defined (__BUILDING_STLPORT)
# include <stl/config/_native_headers.h> # include <stl/config/_native_headers.h>
@ -94,7 +94,7 @@ extern "C" {
# endif # endif
# endif # endif
# if defined (_STLP_NEW_PLATFORM_SDK) # if defined (_STLP_NEW_PLATFORM_SDK) && !defined(_WDMDDK_)
# include <windef.h> # include <windef.h>
_STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedIncrement(IN OUT LONG volatile *); _STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedIncrement(IN OUT LONG volatile *);
_STLP_IMPORT_DECLSPEC LONG _STLP_STDCALL InterlockedDecrement(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. */ * to avoid macro definition conflict. */
# if !defined (_WIN64) # if !defined (_WIN64)
/* Under 32 bits platform we rely on a simple InterlockedExchange call. */ /* 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 /* 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 * 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. * have to fix it the day we need this function for a C translation unit.