# Linking\r
link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)\r
set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")\r
+set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -lstdc++ -lsupc++ -lgcc -lmingwex -lmingw32 <LINK_LIBRARIES>")\r
set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")\r
\r
# Compiler Core\r
add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls)\r
\r
# C++ Flags\r
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")\r
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")\r
\r
# Macros\r
macro(set_entrypoint MODULE ENTRYPOINT)\r
endmacro()\r
\r
macro(set_module_type MODULE TYPE)\r
- target_link_libraries(${MODULE} mingw_wmain mingw_common)\r
+\r
+ add_dependencies(${MODULE} builno_header psdk)\r
+ \r
if(${TYPE} MATCHES nativecui)\r
set_subsystem(${MODULE} native)\r
set_entrypoint(${MODULE} NtProcessStartup@4)\r
endif()\r
if(${TYPE} MATCHES win32gui)\r
set_subsystem(${MODULE} windows)\r
- set_entrypoint(${MODULE} wWinMainCRTStartup)\r
+ set_entrypoint(${MODULE} WinMainCRTStartup)\r
endif()\r
if(${TYPE} MATCHES win32cui)\r
set_subsystem(${MODULE} windows)\r
set_entrypoint(${MODULE} mainCRTStartup)\r
endif()\r
+ if(${TYPE} MATCHES win32dll)\r
+ target_link_libraries(${MODULE} mingw_dllmain mingw_common)\r
+ set_entrypoint(${MODULE} DllMain@12)\r
+ endif()\r
endmacro()\r
\r
endif()\r
\r
+macro(set_unicode MODULE STATE)\r
+ if(${STATE} MATCHES yes)\r
+ add_definitions(-DUNICODE -D_UNICODE)\r
+ target_link_libraries(${MODULE} mingw_wmain)\r
+ else()\r
+ target_link_libraries(${MODULE} mingw_main)\r
+ endif()\r
+ \r
+ target_link_libraries(${MODULE} mingw_common)\r
+endmacro()\r
+\r
+
\ No newline at end of file
SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ")
# Use stdcall fixups, and don't link with anything by default unless we say so
-set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the environment libgcc here
+set(CMAKE_C_STANDARD_LIBRARIES "-lgcc")
+
+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")
elseif(ARCH MATCHES amd64)