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

[FRAMEDYN]

Browse source 
* Fix the MSVC build for real now, so that we don't keep fixing it bit by bit until r60000.

svn path=/trunk/; revision=59946
This commit is contained in:
Amine Khaldi 2013-09-01 15:51:32 +00:00
parent ac2c013400
commit 50acbd2f5c
2 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
reactos/dll/win32/framedyn/CMakeLists.txt
View file

@ -1,31 +1,16 @@
set_cpp(WITH_RUNTIME) set_cpp(WITH_RUNTIME)
list(APPEND SOURCE main.c chstring.cpp)
if(NOT MSVC) add_library(framedyn SHARED ${SOURCE})
spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB)
else()
spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB)
endif()
list(APPEND SOURCE
main.c
chstring.cpp
${CMAKE_CURRENT_BINARY_DIR}/framedyn.def)
add_library(framedyn SHARED
${SOURCE})
set_module_type(framedyn win32dll UNICODE) set_module_type(framedyn win32dll UNICODE)
add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll)
add_importlibs(framedyn
msvcrt
kernel32
oleaut32
ntdll)
if(NOT MSVC) if(NOT MSVC)
# FIXME: http://www.cmake.org/Bug/view.php?id=12998 # FIXME: http://www.cmake.org/Bug/view.php?id=12998
#add_target_compile_flags(framedyn "-fexceptions -Wno-deprecated-declarations") #add_target_compile_flags(framedyn "-fexceptions -Wno-deprecated-declarations")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fexceptions -Wno-deprecated-declarations") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fexceptions -Wno-deprecated-declarations")
spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB)
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def)
endif() endif()
add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all)

6
reactos/dll/win32/framedyn/chstring.cpp
View file

@ -844,7 +844,7 @@ void CHString::MakeLower() throw (CHeap_Exception)
CopyBeforeWrite(); CopyBeforeWrite();
// Let's use appropriate helper // Let's use appropriate helper
wcslwr(m_pchData); _wcslwr(m_pchData);
} }
/* /*
@ -856,7 +856,7 @@ void CHString::MakeReverse() throw (CHeap_Exception)
CopyBeforeWrite(); CopyBeforeWrite();
// Let's use appropriate helper // Let's use appropriate helper
wcsrev(m_pchData); _wcsrev(m_pchData);
} }
/* /*
@ -868,7 +868,7 @@ void CHString::MakeUpper() throw (CHeap_Exception)
CopyBeforeWrite(); CopyBeforeWrite();
// Let's use appropriate helper // Let's use appropriate helper
wcsupr(m_pchData); _wcsupr(m_pchData);
} }
/* /*