From 28003cebece6a1be459e82725d27295c362718df Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Tue, 12 Nov 2013 13:17:41 +0000
Subject: [PATCH] [OPENGL32] - Fix MSVC_IDE build CORE-7570 #resolve

svn path=/trunk/; revision=60960
---
 reactos/dll/opengl/mesa/x86/CMakeLists.txt | 8 ++++++--
 reactos/dll/opengl/opengl32/CMakeLists.txt | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/opengl/mesa/x86/CMakeLists.txt b/reactos/dll/opengl/mesa/x86/CMakeLists.txt
index 3648858aa26..e05a01a18cb 100644
--- a/reactos/dll/opengl/mesa/x86/CMakeLists.txt
+++ b/reactos/dll/opengl/mesa/x86/CMakeLists.txt
@@ -4,6 +4,10 @@ list(APPEND SOURCE
     x86_xform.c
     3dnow.c
     sse.c
+    rtasm/x86sse.c
+)
+
+list(APPEND ASM_SOURCE
     common_x86_asm.S
     x86_xform2.S
     x86_xform3.S
@@ -21,10 +25,10 @@ list(APPEND SOURCE
     sse_xform4.S
     sse_normal.S
     read_rgba_span_x86.S
-    rtasm/x86sse.c
 )
 
-add_library(mesa_x86 STATIC ${SOURCE})
+add_asm_files(mesa_x86_asm ${ASM_SOURCE})
+add_library(mesa_x86 STATIC ${SOURCE} ${mesa_x86_asm))
 
 if(NOT MSVC)
     add_compile_flags("-Wno-format")
diff --git a/reactos/dll/opengl/opengl32/CMakeLists.txt b/reactos/dll/opengl/opengl32/CMakeLists.txt
index 5dcb6848326..1d9d24724d5 100644
--- a/reactos/dll/opengl/opengl32/CMakeLists.txt
+++ b/reactos/dll/opengl/opengl32/CMakeLists.txt
@@ -28,12 +28,12 @@ set_source_files_properties(gcrt0.o libgmon.a PROPERTIES EXTERNAL_OBJECT TRUE)
 
 if(ARCH STREQUAL "i386")
     # Optimisation: use asm trampolines to ICD provided functions
-    list(APPEND SOURCE
+    add_asm_files(opengl32_asm
         glapi_x86.s
     )
 endif()
 
-add_library(opengl32 SHARED ${SOURCE})
+add_library(opengl32 SHARED ${SOURCE} ${opengl32_asm})
 target_link_libraries(opengl32
     wine
     ${PSEH_LIB}
@@ -53,4 +53,4 @@ endif()
 set_module_type(opengl32 win32dll)
 
 add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll)
-add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)
\ No newline at end of file
+add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)
-- 
2.17.1