[CMAKE]
authorSylvain Petreolle <spetreolle@yahoo.fr>
Fri, 5 Nov 2010 09:38:42 +0000 (09:38 +0000)
committerSylvain Petreolle <spetreolle@yahoo.fr>
Fri, 5 Nov 2010 09:38:42 +0000 (09:38 +0000)
Revert incorrect auto import change and use proper definitions instead.

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

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

index bd897d8..1875140 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(find find.c find.rc)
 
index e22e80f..c0a8e60 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(hostname hostname.c hostname.rc)
 
index 35a8b8d..4ca7653 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 list(APPEND SOURCE
     misc.c
index b1923e2..036f0f7 100644 (file)
@@ -1,4 +1,5 @@
 add_definitions(-D__USE_W32_SOCKETS)
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(finger 
     finger.c
index 663c2be..5f7d38b 100644 (file)
@@ -1,3 +1,5 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
+
 add_executable(ftp
     cmds.c
     cmdtab.c
index c57dca1..997e3cd 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(whois whois.c whois.rc)
 
index e14fe11..7a0fa1b 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 list(APPEND SOURCE
     misc.c
index 281c8f7..11cd2ad 100644 (file)
@@ -5,7 +5,10 @@ list(APPEND SOURCE
     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()
index 76ef9f2..f86a014 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 add_executable(telnetd
     telnetd.c
index 27d1a5c..ec083ee 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
 
index d3b0208..dc5767a 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
index 2cce46c..3647e79 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(.)
 set_rc_compiler()
index 80d1b27..b093c8b 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/wine)
 add_definitions(-D__WINESRC__)
index 1a7dae4..d74c4d3 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
 include_directories(.)
index 3ad3d84..5f09816 100644 (file)
@@ -4,6 +4,6 @@ add_subdirectory(dxtn)
 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)
index c56ac3d..4be1057 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -11,7 +11,7 @@ else()
 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
index ca5c16d..c9ab950 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
 
index f449eb8..6f436bf 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(
     BEFORE .
index d43233f..6281b24 100644 (file)
@@ -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 -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: