From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 14 Jan 2010 09:42:17 +0000 (+0000)
Subject: [MESA32]
X-Git-Tag: backups/aicom-network-stable@46924^2~62
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=06eb4351b21eb5692dc7bc50f7c07f600c2e905d

[MESA32]
Add amd64 specific rbuild entries

svn path=/trunk/; revision=45076
---

diff --git a/reactos/dll/3rdparty/mesa32/mesa32.rbuild b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
index 345416716b4..d160a8df692 100644
--- a/reactos/dll/3rdparty/mesa32/mesa32.rbuild
+++ b/reactos/dll/3rdparty/mesa32/mesa32.rbuild
@@ -11,9 +11,14 @@
 	<define name="BUILD_GL32" />
 	<define name="WIN32" />
 	<define name="USE_EXTERNAL_DXTN_LIB=1" />
-	<define name="USE_X86_ASM" />
-	<define name="USE_MMX_ASM" />
-	<define name="USE_SSE_ASM" />
+	<if property="ARCH" value="i386">
+		<define name="USE_X86_ASM" />
+		<define name="USE_MMX_ASM" />
+		<define name="USE_SSE_ASM" />
+	</if>
+	<ifnot property="ARCH" value="i386">
+		<define name="GL_NO_STDCALL" />
+	</ifnot>
 	<define name="USE_3DNOW_ASM" />
 	<include base="mesa32">include</include>
 	<include base="mesa32">src</include>
@@ -221,7 +226,9 @@
 		<file>t_vertex.c</file>
 		<file>t_vertex_generic.c</file>
 		<file>t_vp_build.c</file>
-		<file>t_vertex_sse.c</file>
+		<if property="ARCH" value="i386">
+			<file>t_vertex_sse.c</file>
+		</if>
 	</directory>
 	<directory name="vbo">
 		<file>vbo_context.c</file>
@@ -256,35 +263,44 @@
 			</directory>
 		</directory>
 	</directory>
-	<directory name="x86">
-		<directory name="rtasm">
-			<file>x86sse.c</file>
+
+	<if property="ARCH" value="i386">
+		<directory name="x86">
+			<directory name="rtasm">
+				<file>x86sse.c</file>
+			</directory>
+			<file>3dnow.c</file>
+			<file>3dnow_normal.S</file>
+			<file>3dnow_xform1.S</file>
+			<file>3dnow_xform2.S</file>
+			<file>3dnow_xform3.S</file>
+			<file>3dnow_xform4.S</file>
+			<file>common_x86.c</file>
+			<file>common_x86_asm.S</file>
+			<file>glapi_x86.S</file>
+			<file>mmx_blend.S</file>
+			<file>read_rgba_span_x86.S</file>
+			<file>sse_normal.S</file>
+			<file>sse_xform1.S</file>
+			<file>sse_xform2.S</file>
+			<file>sse_xform3.S</file>
+			<file>sse_xform4.S</file>
+			<file>x86.c</file>
+			<file>x86_cliptest.S</file>
+			<file>x86_xform2.S</file>
+			<file>x86_xform3.S</file>
+			<file>x86_xform4.S</file>
+			<file>sse.c</file>
 		</directory>
-		<file>3dnow.c</file>
-		<file>3dnow_normal.S</file>
-		<file>3dnow_xform1.S</file>
-		<file>3dnow_xform2.S</file>
-		<file>3dnow_xform3.S</file>
-		<file>3dnow_xform4.S</file>
-		<file>common_x86.c</file>
-		<file>common_x86_asm.S</file>
-		<file>glapi_x86.S</file>
-		<file>mmx_blend.S</file>
-		<file>read_rgba_span_x86.S</file>
-		<file>sse_normal.S</file>
-		<file>sse_xform1.S</file>
-		<file>sse_xform2.S</file>
-		<file>sse_xform3.S</file>
-		<file>sse_xform4.S</file>
-		<file>x86.c</file>
-		<file>x86_cliptest.S</file>
-		<file>x86_xform2.S</file>
-		<file>x86_xform3.S</file>
-		<file>x86_xform4.S</file>
-		<file>sse.c</file>
-	</directory>
-	<directory name="x86-64">
-		<file>x86-64.c</file>
+	</if>
+
+	<if property="ARCH" value="amd64">
+		<directory name="x86-64">
+			<file>x86-64.c</file>
+			<!-- file>glapi_x86-64.S</file -->
+			<file>xform4.S</file>
+		</directory>
+	</if>
+
 	</directory>
-</directory>
 </module>