[ros-diffs] [tkreuzer] 49157: [WINED3D] Our CRT causes duplicate definitions, when trying to use it as fallback for missing msvcrt imports. Work around this limitation by adding powf and sqrtf wrappers for amd...

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Fri Oct 15 16:56:13 2010
New Revision: 49157

URL: http://svn.reactos.org/svn/reactos?rev=49157&view=rev
Log:
[WINED3D]
Our CRT causes duplicate definitions, when trying to use it as fallback for missing msvcrt imports. Work around this limitation by adding powf and sqrtf wrappers for amd64 builds

Added:
    trunk/reactos/dll/directx/wine/wined3d/powf.c   (with props)
    trunk/reactos/dll/directx/wine/wined3d/sqrtf.c   (with props)
Modified:
    trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild

Added: trunk/reactos/dll/directx/wine/wined3d/powf.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/powf.c?rev=49157&view=auto
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/powf.c (added)
+++ trunk/reactos/dll/directx/wine/wined3d/powf.c [iso-8859-1] Fri Oct 15 16:56:13 2010
@@ -1,0 +1,11 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the w64 mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
+#include <math.h>
+
+float powf(float x, float y)
+{
+    return (float)pow((double)x, (double)y);
+}

Propchange: trunk/reactos/dll/directx/wine/wined3d/powf.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/directx/wine/wined3d/sqrtf.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/sqrtf.c?rev=49157&view=auto
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/sqrtf.c (added)
+++ trunk/reactos/dll/directx/wine/wined3d/sqrtf.c [iso-8859-1] Fri Oct 15 16:56:13 2010
@@ -1,0 +1,11 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the w64 mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
+#include <math.h>
+
+float sqrtf(float x)
+{
+    return (float)sqrt((double)x);
+}

Propchange: trunk/reactos/dll/directx/wine/wined3d/sqrtf.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild?rev=49157&r1=49156&r2=49157&view=diff
==============================================================================
--- trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/wined3d/wined3d.rbuild [iso-8859-1] Fri Oct 15 16:56:13 2010
@@ -13,9 +13,6 @@
 	<library>gdi32</library>
 	<library>advapi32</library>
 	<library>uuid</library>
-	<if property="ARCH" value="amd64">
-		<library>crt</library>
-	</if>
 
 	<file>ati_fragment_shader.c</file>
 	<file>arb_program_shader.c</file>
@@ -52,6 +49,10 @@
 	<file>volumetexture.c</file>
 	<file>wined3d_main.c</file>
 	<file>version.rc</file>
+	<if property="ARCH" value="amd64">
+		<file>powf.c</file>
+		<file>sqrtf.c</file>
+	</if>
 
 	<dependency>wineheaders</dependency>
 </module>