[ros-diffs] [akhaldi] 49015: [CMAKE] - Add win32ocx module type. - Disable the linker script for now.

Author: akhaldi
Date: Wed Oct  6 13:24:46 2010
New Revision: 49015

URL: http://svn.reactos.org/svn/reactos?rev=49015&view=rev
Log:
[CMAKE]
- Add win32ocx module type.
- Disable the linker script for now.

Modified:
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/toolchain-mingw32.cmake

Modified: branches/cmake-bringup/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=490…
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Oct  6 13:24:46 2010
@@ -93,6 +93,10 @@
     if(${TYPE} MATCHES win32dll)
         set_entrypoint(${MODULE} DllMain@12)
     endif()
+    if(${TYPE} MATCHES win32ocx)
+        set_entrypoint(${MODULE} DllMain@12)
+        set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx")
+    endif()
 endmacro()
 
 endif()

Modified: branches/cmake-bringup/toolchain-mingw32.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32…
==============================================================================
--- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Oct  6 13:24:46 2010
@@ -38,7 +38,8 @@
 set(CMAKE_CXX_STANDARD_LIBRARIES "")
 
 if(ARCH MATCHES i386)
-set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib
-Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at
-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib
-Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at")
+#-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
 elseif(ARCH MATCHES amd64)
 set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib
-Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at")
 endif(ARCH MATCHES i386)