From cec00257f38c4625eb8a45e2891ebee5488989dc Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 6 Oct 2010 13:24:46 +0000 Subject: [PATCH] [CMAKE] - Add win32ocx module type. - Disable the linker script for now. svn path=/branches/cmake-bringup/; revision=49015 --- gcc.cmake | 4 ++++ toolchain-mingw32.cmake | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc.cmake b/gcc.cmake index 14e10d68e07..80fe006eeed 100644 --- a/gcc.cmake +++ b/gcc.cmake @@ -93,6 +93,10 @@ macro(set_module_type MODULE TYPE) 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() diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake index b8b49d20347..7eb136d2f20 100644 --- a/toolchain-mingw32.cmake +++ b/toolchain-mingw32.cmake @@ -38,7 +38,8 @@ MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) 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)