[akhaldi] 52251: [CMAKE] * Rename _math.h to math.h and merge r50732 from the cmake branch. * Remove msvchelper.h as it's not needed anymore for d3d8 and d3d9. * Skip ftp, libxslt and ksproxy from ...
Author: akhaldi Date: Wed Jun 15 18:55:48 2011 New Revision: 52251
URL: http://svn.reactos.org/svn/reactos?rev=52251&view=rev Log: [CMAKE] * Rename _math.h to math.h and merge r50732 from the cmake branch. * Remove msvchelper.h as it's not needed anymore for d3d8 and d3d9. * Skip ftp, libxslt and ksproxy from msvc build. * Dedicated to igorko.
Added: trunk/reactos/include/reactos/wine/math.h - copied unchanged from r52248, trunk/reactos/include/reactos/wine/_math.h Removed: trunk/reactos/include/reactos/msvchelper.h trunk/reactos/include/reactos/wine/_math.h Modified: trunk/reactos/base/applications/network/CMakeLists.txt trunk/reactos/dll/3rdparty/CMakeLists.txt trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h
Modified: trunk/reactos/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/C... ============================================================================== --- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -2,7 +2,9 @@ add_subdirectory(arp) add_subdirectory(dwnl) add_subdirectory(finger) -add_subdirectory(ftp) +if(NOT MSVC) + add_subdirectory(ftp) # FIXME: fix msvc build +endif() add_subdirectory(ipconfig) add_subdirectory(net) add_subdirectory(netstat) @@ -10,7 +12,7 @@ add_subdirectory(ping) add_subdirectory(route) if(NOT MSVC) -add_subdirectory(telnet) + add_subdirectory(telnet) # FIXME: fix msvc build endif() add_subdirectory(tracert) add_subdirectory(whois)
Modified: trunk/reactos/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/CMakeLists.txt... ============================================================================== --- trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -5,7 +5,8 @@ add_subdirectory(libjpeg) add_subdirectory(libpng) add_subdirectory(libtiff) -add_subdirectory(libxslt) + if(NOT MSVC) -add_subdirectory(mesa32) + add_subdirectory(libxslt) + add_subdirectory(mesa32) endif()
Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt?... ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -16,7 +16,9 @@ add_subdirectory(dsound) #add_subdirectory(dsound_new) #disabled in trunk add_subdirectory(dxdiagn) -add_subdirectory(ksproxy) +if(NOT MSVC) + add_subdirectory(ksproxy) #FIXME: fix msvc build +endif() add_subdirectory(ksuser) add_subdirectory(msdmo) #add_subdirectory(msdvbnp) #disabled in trunk
Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMake... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -6,10 +6,6 @@ -DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -if(MSVC) - add_definitions(-FImsvchelper.h) -endif()
set_rc_compiler()
Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMake... ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -6,10 +6,6 @@ -DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -if(MSVC) - add_definitions(-FImsvchelper.h) -endif()
set_rc_compiler()
Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/wi... ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Wed Jun 15 18:55:48 2011 @@ -196,8 +196,8 @@ } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if(m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; } }
@@ -218,8 +218,8 @@ } else { - if (m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + if (m == 0) return sgn * INFINITY; /* +INF / -INF */ + else return NAN; } }
Removed: trunk/reactos/include/reactos/msvchelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/msvchelper.... ============================================================================== --- trunk/reactos/include/reactos/msvchelper.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/msvchelper.h (removed) @@ -1,32 +1,0 @@ - -// -#ifdef _M_IX86 -void __stdcall wined3d_mutex_lock(void); -void __stdcall wined3d_mutex_unlock(void); -void* __stdcall WineDirect3DCreate(unsigned int dxVersion,void *parent); - -void __inline wined3d_mutex_lock_inline(void) -{ - wined3d_mutex_lock(); -} - -void __inline wined3d_mutex_unlock_inline(void) -{ - wined3d_mutex_unlock(); -} - -__inline -struct IWineD3D* WineDirect3DCreate_inline(unsigned int dxVersion,void *parent) -{ - return WineDirect3DCreate(dxVersion, parent); -} - -#define wined3d_mutex_lock wined3d_mutex_lock_inline -#define wined3d_mutex_unlock wined3d_mutex_unlock_inline -#define WineDirect3DCreate WineDirect3DCreate_inline - -#endif /* _M_IX86 */ - - - -
Removed: trunk/reactos/include/reactos/wine/_math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/_math.... ============================================================================== --- trunk/reactos/include/reactos/wine/_math.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/_math.h (removed) @@ -1,26 +1,0 @@ -#ifndef __WINE_MATH_H_ -#define __WINE_MATH_H_ - -#include <crt/math.h> - -#ifdef _MSC_VER -__forceinline float _NaN() -{ - unsigned long NaN = 0x7fc00000; - return *(float*)&NaN; -} -#define NAN _NaN() - -__forceinline float _Infinity() -{ - unsigned long Infinity = 0x7f800000; - return *(float*)&Infinity; -} -#define INFINITY _Infinity() - -#else -#define NAN (0.0f / 0.0f) -#define INFINITY (1.0F/0.0F) -#endif - -#endif /* __WINE_MATH_H_ */
-
akhaldi＠svn.reactos.org