projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CMAKE]
[reactos.git]
/
msc.cmake
diff --git
a/msc.cmake
b/msc.cmake
index
f1941d7
..
6df3473
100644
(file)
--- a/
msc.cmake
+++ b/
msc.cmake
@@
-15,11
+15,21
@@
add_definitions(/GS- /Zl /Zi)
add_definitions(-Dinline=__inline -D__STDC__=1)
\r
\r
macro(set_entrypoint MODULE ENTRYPOINT)
\r
add_definitions(-Dinline=__inline -D__STDC__=1)
\r
\r
macro(set_entrypoint MODULE ENTRYPOINT)
\r
- set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/ENTRY:${ENTRYPOINT}")
\r
+ set(NEW_LINKER_FLAGS "/ENTRY:${ENTRYPOINT}")
\r
+ get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)
\r
+ if(LINKER_FLAGS)
\r
+ set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")
\r
+ endif()
\r
+ set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS})
\r
endmacro()
\r
\r
macro(set_subsystem MODULE SUBSYSTEM)
\r
endmacro()
\r
\r
macro(set_subsystem MODULE SUBSYSTEM)
\r
- set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/subsystem:${SUBSYSTEM}")
\r
+ set(NEW_LINKER_FLAGS "/subsystem:${SUBSYSTEM}")
\r
+ get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS)
\r
+ if(LINKER_FLAGS)
\r
+ set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}")
\r
+ endif()
\r
+ set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS})
\r
endmacro()
\r
\r
macro(add_importlibs MODULE)
\r
endmacro()
\r
\r
macro(add_importlibs MODULE)
\r
@@
-36,6
+46,15
@@
macro(set_module_type MODULE TYPE)
if (${TYPE} MATCHES win32gui)
\r
set_subsystem(${MODULE} windows)
\r
endif ()
\r
if (${TYPE} MATCHES win32gui)
\r
set_subsystem(${MODULE} windows)
\r
endif ()
\r
+ if (${TYPE} MATCHES win32cui)
\r
+ set_subsystem(${MODULE} console)
\r
+ endif ()
\r
+endmacro()
\r
+
\r
+macro(set_unicode MODULE STATE)
\r
+ if(${STATE} MATCHES yes)
\r
+ add_definitions(-DUNICODE -D_UNICODE)
\r
+ endif()
\r
endmacro()
\r
\r
endif()
\r
endmacro()
\r
\r
endif()
\r
@@
-43,3
+62,6
@@
endif()
set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
\r
SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
\r
\r
set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
\r
SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
\r
\r
+macro(set_rc_compiler)
\r
+# dummy, this workaround is only needed in mingw due to lack of RC support in cmake
\r
+endmacro()
\ No newline at end of file