Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-04 02:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
Revert incorrect auto import change and use proper definitions instead.

svn path=/branches/cmake-bringup/; revision=49476
This commit is contained in:
Sylvain Petreolle 2010-11-05 09:38:42 +00:00
parent de201a2357
commit 8456a5473e
23 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/applications/cmdutils/find/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(find find.c find.rc)

1
base/applications/cmdutils/hostname/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(hostname hostname.c hostname.rc)

1
base/applications/logoff/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE
misc.c

1
base/applications/network/dwnl/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()

1
base/applications/network/finger/CMakeLists.txt
View file

@ -1,4 +1,5 @@
add_definitions(-D__USE_W32_SOCKETS)
add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(finger
finger.c

2
base/applications/network/ftp/CMakeLists.txt
View file

@ -1,3 +1,5 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(ftp
cmds.c
cmdtab.c

1
base/applications/network/route/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()

1
base/applications/network/whois/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(whois whois.c whois.rc)

1
base/applications/regedit/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()

1
base/applications/shutdown/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE
misc.c

1
base/applications/sndvol32/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()

5
base/applications/wordpad/CMakeLists.txt
View 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()

1
base/services/telnetd/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
add_executable(telnetd
telnetd.c

1
base/system/bootok/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()

1
base/system/expand/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)

1
base/system/format/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(.)
set_rc_compiler()

1
base/system/msiexec/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
add_definitions(-D__WINESRC__)

1
base/system/regsvr32/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()
include_directories(.)

2
dll/3rdparty/CMakeLists.txt vendored
View 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)

2
gcc.cmake
View file

@ -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

1
lib/smlib/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)

1
subsystems/win32/csrss/win32csr/CMakeLists.txt
View file

@ -1,3 +1,4 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(
BEFORE .

4
toolchain-mingw32.cmake
View 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: