mirror of
https://github.com/reactos/reactos.git
synced 2025-07-31 15:51:49 +00:00
[FRAMEDYN]
* 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:
parent
ac2c013400
commit
50acbd2f5c
2 changed files with 9 additions and 24 deletions
|
@ -1,31 +1,16 @@
|
|||
|
||||
set_cpp(WITH_RUNTIME)
|
||||
|
||||
if(NOT MSVC)
|
||||
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})
|
||||
|
||||
list(APPEND SOURCE main.c chstring.cpp)
|
||||
add_library(framedyn SHARED ${SOURCE})
|
||||
set_module_type(framedyn win32dll UNICODE)
|
||||
|
||||
add_importlibs(framedyn
|
||||
msvcrt
|
||||
kernel32
|
||||
oleaut32
|
||||
ntdll)
|
||||
add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll)
|
||||
|
||||
if(NOT MSVC)
|
||||
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
||||
#add_target_compile_flags(framedyn "-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()
|
||||
|
||||
add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all)
|
||||
|
|
|
@ -844,7 +844,7 @@ void CHString::MakeLower() throw (CHeap_Exception)
|
|||
CopyBeforeWrite();
|
||||
|
||||
// Let's use appropriate helper
|
||||
wcslwr(m_pchData);
|
||||
_wcslwr(m_pchData);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -856,7 +856,7 @@ void CHString::MakeReverse() throw (CHeap_Exception)
|
|||
CopyBeforeWrite();
|
||||
|
||||
// Let's use appropriate helper
|
||||
wcsrev(m_pchData);
|
||||
_wcsrev(m_pchData);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -868,7 +868,7 @@ void CHString::MakeUpper() throw (CHeap_Exception)
|
|||
CopyBeforeWrite();
|
||||
|
||||
// Let's use appropriate helper
|
||||
wcsupr(m_pchData);
|
||||
_wcsupr(m_pchData);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue