[ros-diffs] [spetreolle] 49476: [CMAKE] Revert incorrect auto import change and use proper definitions instead.

spetreolle at svn.reactos.org spetreolle at svn.reactos.org
Fri Nov 5 09:38:44 UTC 2010


Author: spetreolle
Date: Fri Nov  5 09:38:42 2010
New Revision: 49476

URL: http://svn.reactos.org/svn/reactos?rev=49476&view=rev
Log:
[CMAKE]
Revert incorrect auto import change and use proper definitions instead.

Modified:
    branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt
    branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt
    branches/cmake-bringup/base/applications/logoff/CMakeLists.txt
    branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt
    branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt
    branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt
    branches/cmake-bringup/base/applications/network/route/CMakeLists.txt
    branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt
    branches/cmake-bringup/base/applications/regedit/CMakeLists.txt
    branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt
    branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt
    branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt
    branches/cmake-bringup/base/services/telnetd/CMakeLists.txt
    branches/cmake-bringup/base/system/bootok/CMakeLists.txt
    branches/cmake-bringup/base/system/expand/CMakeLists.txt
    branches/cmake-bringup/base/system/format/CMakeLists.txt
    branches/cmake-bringup/base/system/msiexec/CMakeLists.txt
    branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt
    branches/cmake-bringup/dll/3rdparty/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/lib/smlib/CMakeLists.txt
    branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt
    branches/cmake-bringup/toolchain-mingw32.cmake

Modified: branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/cmdutils/find/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(find find.c find.rc)
 

Modified: branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/cmdutils/hostname/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(hostname hostname.c hostname.rc)
 

Modified: branches/cmake-bringup/base/applications/logoff/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/logoff/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/logoff/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 list(APPEND SOURCE
     misc.c

Modified: branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/network/dwnl/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
 

Modified: branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/network/finger/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,4 +1,5 @@
 add_definitions(-D__USE_W32_SOCKETS)
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(finger 
     finger.c

Modified: branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/network/ftp/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,5 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
+
 add_executable(ftp
     cmds.c
     cmdtab.c

Modified: branches/cmake-bringup/base/applications/network/route/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/network/route/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/network/route/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
 

Modified: branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/network/whois/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(whois whois.c whois.rc)
 

Modified: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/regedit/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
 

Modified: branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/shutdown/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 list(APPEND SOURCE
     misc.c

Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
 

Modified: branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -5,7 +5,10 @@
     wordpad.c
     rsrc.rc)
 
-add_definitions(-D__ROS_LONG64__)
+add_definitions(
+    -D__ROS_LONG64__
+    -D_DLL -D__USE_CRTIMP)
+
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 set_rc_compiler()

Modified: branches/cmake-bringup/base/services/telnetd/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/telnetd/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/services/telnetd/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(telnetd
     telnetd.c

Modified: branches/cmake-bringup/base/system/bootok/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/bootok/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/bootok/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
 

Modified: branches/cmake-bringup/base/system/expand/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/expand/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/expand/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 

Modified: branches/cmake-bringup/base/system/format/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/format/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/format/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(.)
 set_rc_compiler()

Modified: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiexec/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/wine)
 add_definitions(-D__WINESRC__)

Modified: branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/regsvr32/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
 include_directories(.)

Modified: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/3rdparty/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -4,6 +4,6 @@
 endif()
 add_subdirectory(libjpeg)
 add_subdirectory(libpng)
-add_subdirectory(libtiff)
+#add_subdirectory(libtiff)#FIXME : unresolved symbol _pei386_runtime_relocator
 add_subdirectory(libxslt)
 add_subdirectory(mesa32)

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -11,7 +11,7 @@
 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> <LINK_LIBRARIES>")
-set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--enable-auto-import")
+set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at")
 # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
 
 # Compiler Core

Modified: branches/cmake-bringup/lib/smlib/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/smlib/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 

Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Fri Nov  5 09:38:42 2010
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(
     BEFORE .

Modified: branches/cmake-bringup/toolchain-mingw32.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32.cmake?rev=49476&r1=49475&r2=49476&view=diff
==============================================================================
--- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Fri Nov  5 09:38:42 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 -Wl,--enable-auto-import")
+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)
-set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,--enable-auto-import")
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at")
 endif(ARCH MATCHES i386)
 
 # adjust the default behaviour of the FIND_XXX() commands:




More information about the Ros-diffs mailing list