[CMAKE]

- Explicitly disable auto imports, and fix the modules that were missed out by the previous related commit.
- Dedicated to Usurp.

svn path=/branches/cmake-bringup/; revision=49497

base/applications/network/telnet/CMakeLists.txt

@@ -1,4 +1,6 @@
-add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+add_definitions(
+    -D_CRT_NONSTDC_NO_DEPRECATE
+    -D_DLL -D__USE_CRTIMP)
 
 set_cpp()
 

base/applications/winhlp32/CMakeLists.txt

@@ -5,7 +5,8 @@ add_definitions(
     -D__ROS_LONG64__
     -D_CRT_NONSTDC_NO_DEPRECATE
     -Dfileno=_fileno
-    -Disatty=_isatty)
+    -Disatty=_isatty
+    -D_DLL -D__USE_CRTIMP)
 
 add_executable(winhlp32
     callback.c

base/shell/explorer/CMakeLists.txt

@@ -8,8 +8,10 @@ set_unicode()
 #jgardou
 #set_cpp()
 
-add_definitions(-DWIN32)
-add_definitions(-D__WINDRES__)
+add_definitions(
+    -DWIN32
+    -D__WINDRES__
+    -D_DLL -D__USE_CRTIMP)
 
 #add_pch(explorer ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h SOURCE)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@@ -47,7 +49,7 @@ list(APPEND SOURCE
     utility/dragdropimpl.cpp
     utility/utility.cpp
     utility/xmlstorage.cpp
-    utility/splitpath.c
+#   utility/splitpath.c     msvcrt has _wsplitpath already
     utility/window.cpp
     utility/shellbrowserimpl.cpp) #    utility/shelltests.cpp
 
@@ -78,7 +80,7 @@ target_link_libraries(explorer
     -lmsvcrt
     -lkernel32
     -lntdll)
-	
+
 set_image_base(explorer 0x00400000)
 
 add_dependencies(explorer psdk buildno_header)

lib/3rdparty/stlport/CMakeLists.txt

@@ -2,7 +2,9 @@
 #uncomment this if you want to test c++ compilation
 #add_subdirectory(test)
 
-add_definitions(-D_STLP_USE_EXCEPTIONS)
+add_definitions(
+    -D_STLP_USE_EXCEPTIONS
+    -D_DLL -D__USE_CRTIMP)
 
 set_cpp()
 

toolchain-mingw32.cmake

@@ -38,10 +38,10 @@ set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")
 set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ 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")
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--disable-auto-import")
 #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
 elseif(ARCH MATCHES amd64)
-set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at")
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--disable-auto-import")
 endif(ARCH MATCHES i386)
 
 # adjust the default behaviour of the FIND_XXX() commands: