[ros-diffs] [tfaber] 60960: [OPENGL32] - Fix MSVC_IDE build CORE-7570 #resolve

Author: tfaber
Date: Tue Nov 12 13:17:41 2013
New Revision: 60960

URL: http://svn.reactos.org/svn/reactos?rev=60960&view=rev
Log:
[OPENGL32]
- Fix MSVC_IDE build
CORE-7570 #resolve

Modified:
    trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt
    trunk/reactos/dll/opengl/opengl32/CMakeLists.txt

Modified: trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/x86/CMakeL…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/x86/CMakeLists.txt	[iso-8859-1] Tue Nov 12 13:17:41
2013
@@ -4,6 +4,10 @@
     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 @@
     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")

Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL…
==============================================================================
--- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt	[iso-8859-1] Tue Nov 12 13:17:41
2013
@@ -28,12 +28,12 @@
 
 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 @@
 set_module_type(opengl32 win32dll)
 
 add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll)
-add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)
+add_cd_file(TARGET opengl32 DESTINATION reactos/system32 FOR all)