Author: janderwald
Date: Fri Feb 18 14:58:30 2011
New Revision: 50802
URL: http://svn.reactos.org/svn/reactos?rev=50802&view=rev
Log:
- Fix a few linking errors for msvc CMakeLists
- Fails to find _isinf
Modified:
branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c
Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt?rev=50802&r1=50801&r2=50802&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1]
Fri Feb 18 14:58:30 2011
@@ -46,7 +46,6 @@
volumetexture.c
wined3d_main.c
version.rc
- #${REACTOS_BINARY_DIR}/include/reactos/wine/wined3d_i.c
${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
if(ARCH MATCHES amd64)
@@ -58,7 +57,7 @@
add_library(wined3d SHARED ${SOURCE})
set_module_type(wined3d win32dll)
-target_link_libraries(wined3d wine uuid)
+target_link_libraries(wined3d wine uuid wined3d_guid)
add_importlibs(wined3d
user32
Modified: branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c?rev=50802&r1=50801&r2=50802&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/surface_base.c [iso-8859-1]
Fri Feb 18 14:58:30 2011
@@ -43,7 +43,7 @@
/* Deal with special numbers */
if (*in == 0.0f) return 0x0000;
- if(isnan(*in)) return 0x7C01;
+ if(_isnan(*in)) return 0x7C01;
if (isinf(*in)) return (*in < 0.0f ? 0xFC00 : 0x7c00);
if(tmp < powf(2, 10)) {
