X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=msc.cmake;h=66ee57c50b985ad8fc1cea33a5bbf2a7a343fe16;hp=e1e7e06396009695801e73cc17f3fc3fa36c1a23;hb=7dce7ccce4171b1e16bdbc9b258b15369236600b;hpb=9a79b1e80d88973c37b7dd801a22fbe9fe93a012

diff --git a/msc.cmake b/msc.cmake
index e1e7e063960..66ee57c50b9 100644
--- a/msc.cmake
+++ b/msc.cmake
@@ -1,6 +1,6 @@
 
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")
-  add_definitions(-D__i386__)
+    add_definitions(-D__i386__)
 endif()
 
 add_definitions(-Dinline=__inline)
@@ -14,8 +14,15 @@ else()
 add_definitions(/GS- /Zl /Zi)
 add_definitions(-Dinline=__inline -D__STDC__=1)
 
+set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+
 macro(set_entrypoint MODULE ENTRYPOINT)
-    set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}")
+    if(${ENTRYPOINT} STREQUAL "0")
+        set(NEW_LINKER_FLAGS "/ENTRY:0")
+    else()
+        set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}")
+    endif()
     get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)
     if(LINKER_FLAGS)
         set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")
@@ -33,34 +40,32 @@ macro(set_subsystem MODULE SUBSYSTEM)
 endmacro()
 
 macro(add_importlibs MODULE)
-  FOREACH(LIB ${ARGN})
-    target_link_libraries(${MODULE} ${LIB}.LIB)
-  ENDFOREACH()
+    foreach(LIB ${ARGN})
+        target_link_libraries(${MODULE} ${LIB}.LIB)
+    endforeach()
 endmacro()
 
 macro(set_module_type MODULE TYPE)
-  if(${TYPE} MATCHES nativecui)
-    set_subsystem(${MODULE} native)
-    add_importlibs(${MODULE} ntdll)
-  endif()
-  if (${TYPE} MATCHES win32gui)
-    set_subsystem(${MODULE} windows)
-  endif ()
-  if (${TYPE} MATCHES win32cui)
-    set_subsystem(${MODULE} console)
-  endif ()
+    if(${TYPE} MATCHES nativecui)
+        set_subsystem(${MODULE} native)
+        add_importlibs(${MODULE} ntdll)
+    endif()
+    if (${TYPE} MATCHES win32gui)
+        set_subsystem(${MODULE} windows)
+    endif ()
+    if (${TYPE} MATCHES win32cui)
+        set_subsystem(${MODULE} console)
+    endif ()
 endmacro()
 
-macro(set_unicode MODULE STATE)
-   if(${STATE} MATCHES yes)
-       add_definitions(-DUNICODE -D_UNICODE)
-   endif()
+macro(set_unicode)
+    add_definitions(-DUNICODE -D_UNICODE)
 endmacro()
 
 endif()
 
 set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")
-SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
+set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
 
 macro(set_rc_compiler)
 # dummy, this workaround is only needed in mingw due to lack of RC support in cmake
@@ -68,14 +73,12 @@ endmacro()
 
 #typelib support
 macro(ADD_TYPELIB TARGET)
-  FOREACH(SOURCE ${ARGN})
-    GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE)
-    SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)
-    ADD_CUSTOM_COMMAND(
-      OUTPUT ${OBJECT}
-      COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}
-    )
-    LIST(APPEND OBJECTS ${OBJECT})
-  ENDFOREACH()
-  ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS})
-ENDMACRO()
\ No newline at end of file
+    foreach(SOURCE ${ARGN})
+        get_filename_component(FILE ${SOURCE} NAME_WE)
+        set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb)
+        add_custom_command(OUTPUT ${OBJECT}
+                           COMMAND midl /I ${REACTOS_SOURCE_DIR}/include/dxsdk /I . /I ${REACTOS_SOURCE_DIR}/include /I ${REACTOS_SOURCE_DIR}/include/psdk /win32 /tlb ${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE})
+        list(APPEND OBJECTS ${OBJECT})
+    endforeach()
+    add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS})
+endmacro()