From 4b8f69dfac9234531a8b9d8209523783ace9023b Mon Sep 17 00:00:00 2001
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Sat, 25 Sep 2010 14:22:16 +0000
Subject: [PATCH] [CMAKE] Add set_unicode macro. Add win32dll module type. Set
 CMAKE_CXX_LINK_EXECUTABLE. Clear CMAKE_CXX_STANDARD_LIBRARIES. Improve calc.

svn path=/branches/cmake-bringup/; revision=48871
---
 base/applications/calc/CMakeLists.txt |  2 +-
 gcc.cmake                             | 25 ++++++++++++++++++++++---
 toolchain-mingw32.cmake               |  6 +++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt
index ca35a372aad..67fc3f9dbc5 100644
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@@ -12,7 +12,7 @@ add_executable(calc
     resource.rc)
 
 set_module_type(calc win32gui)
-
+set_unicode(calc yes)
 add_importlibs(calc advapi32 user32 gdi32 msvcrt)
 
 add_dependencies(calc psdk)
diff --git a/gcc.cmake b/gcc.cmake
index b8b41592ba5..6c28f87319f 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -10,6 +10,7 @@ else()
 # Linking
 link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)
 set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
+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>")
 set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
 
 # Compiler Core
@@ -30,7 +31,7 @@ add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-e
 add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls)
 
 # C++ Flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
 
 # Macros
 macro(set_entrypoint MODULE ENTRYPOINT)
@@ -48,20 +49,38 @@ macro(add_importlibs MODULE)
 endmacro()
 
 macro(set_module_type MODULE TYPE)
-  target_link_libraries(${MODULE} mingw_wmain mingw_common)
+
+  add_dependencies(${MODULE} builno_header psdk)
+  
   if(${TYPE} MATCHES nativecui)
     set_subsystem(${MODULE} native)
     set_entrypoint(${MODULE} NtProcessStartup@4)
   endif()
   if(${TYPE} MATCHES win32gui)
     set_subsystem(${MODULE} windows)
-    set_entrypoint(${MODULE} wWinMainCRTStartup)
+    set_entrypoint(${MODULE} WinMainCRTStartup)
   endif()
   if(${TYPE} MATCHES win32cui)
     set_subsystem(${MODULE} windows)
     set_entrypoint(${MODULE} mainCRTStartup)
   endif()
+  if(${TYPE} MATCHES win32dll)
+    target_link_libraries(${MODULE} mingw_dllmain mingw_common)
+    set_entrypoint(${MODULE} DllMain@12)
+  endif()
 endmacro()
 
 endif()
 
+macro(set_unicode MODULE STATE)
+   if(${STATE} MATCHES yes)
+       add_definitions(-DUNICODE -D_UNICODE)
+       target_link_libraries(${MODULE} mingw_wmain)
+   else()
+       target_link_libraries(${MODULE} mingw_main)
+   endif()
+   
+  target_link_libraries(${MODULE} mingw_common)
+endmacro()
+
+  
\ No newline at end of file
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index 3a0b6637a54..b344b2b9456 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -32,7 +32,11 @@ SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win3
 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)