[ros-diffs] [akhaldi] 49497: [CMAKE] - Explicitly disable auto imports, and fix the modules that were missed out by the previous related commit. - Dedicated to Usurp.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Fri Nov 5 21:22:08 UTC 2010


Author: akhaldi
Date: Fri Nov  5 21:22:07 2010
New Revision: 49497

URL: http://svn.reactos.org/svn/reactos?rev=49497&view=rev
Log:
[CMAKE]
- Explicitly disable auto imports, and fix the modules that were missed out by the previous related commit.
- Dedicated to Usurp.

Modified:
    branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt
    branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt
    branches/cmake-bringup/base/shell/explorer/CMakeLists.txt
    branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt
    branches/cmake-bringup/toolchain-mingw32.cmake

Modified: branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt?rev=49497&r1=49496&r2=49497&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Fri Nov  5 21:22:07 2010
@@ -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()
 

Modified: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt?rev=49497&r1=49496&r2=49497&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Fri Nov  5 21:22:07 2010
@@ -5,7 +5,8 @@
     -D__ROS_LONG64__
     -D_CRT_NONSTDC_NO_DEPRECATE
     -Dfileno=_fileno
-    -Disatty=_isatty)
+    -Disatty=_isatty
+    -D_DLL -D__USE_CRTIMP)
 
 add_executable(winhlp32
     callback.c

Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explorer/CMakeLists.txt?rev=49497&r1=49496&r2=49497&view=diff
==============================================================================
--- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Fri Nov  5 21:22:07 2010
@@ -8,8 +8,10 @@
 #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 @@
     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 @@
     -lmsvcrt
     -lkernel32
     -lntdll)
-	
+
 set_image_base(explorer 0x00400000)
 
 add_dependencies(explorer psdk buildno_header)

Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt?rev=49497&r1=49496&r2=49497&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Fri Nov  5 21:22:07 2010
@@ -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()
 

Modified: branches/cmake-bringup/toolchain-mingw32.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32.cmake?rev=49497&r1=49496&r2=49497&view=diff
==============================================================================
--- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Fri Nov  5 21:22:07 2010
@@ -38,10 +38,10 @@
 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:




More information about the Ros-diffs mailing list