X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=msc.cmake;h=6df347348d4340e33e41cfacf12912ed043d8003;hp=270709874c82031fa6c1e7d018661d50abc68cd2;hb=c0c597d9c66fd079ea9cd2b855437afb5cc27abc;hpb=38dd8fce5f984732b96417e17057ff9e9726f202;ds=sidebyside

diff --git a/msc.cmake b/msc.cmake
index 270709874c8..6df347348d4 100644
--- a/msc.cmake
+++ b/msc.cmake
@@ -15,11 +15,21 @@ add_definitions(/GS- /Zl /Zi)
 add_definitions(-Dinline=__inline -D__STDC__=1)
 
 macro(set_entrypoint MODULE ENTRYPOINT)
-  set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/ENTRY:${ENTRYPOINT}")
+    set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}")
+    get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)
+    if(LINKER_FLAGS)
+        set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")
+    endif()
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS})
 endmacro()
 
 macro(set_subsystem MODULE SUBSYSTEM)
-  set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/subsystem:${SUBSYSTEM}")
+    set(NEW_LINKER_FLAGS "/subsystem:${SUBSYSTEM}")
+    get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)
+    if(LINKER_FLAGS)
+        set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")
+    endif()
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS})
 endmacro()
 
 macro(add_importlibs MODULE)
@@ -37,13 +47,21 @@ macro(set_module_type MODULE TYPE)
     set_subsystem(${MODULE} windows)
   endif ()
   if (${TYPE} MATCHES win32cui)
-    set_subsystem(${MODULE} windows)
-    set_entrypoint(${MODULE} mainCRTStartup)
+    set_subsystem(${MODULE} console)
   endif ()
 endmacro()
 
+macro(set_unicode MODULE STATE)
+   if(${STATE} MATCHES yes)
+       add_definitions(-DUNICODE -D_UNICODE)
+   endif()
+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")
 
+macro(set_rc_compiler)
+# dummy, this workaround is only needed in mingw due to lack of RC support in cmake
+endmacro()
\ No newline at end of file