Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 08:25:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- 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
This commit is contained in:
Amine Khaldi 2010-11-05 21:22:07 +00:00
parent 97863bb997
commit 7c79c0ae87
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/applications/network/telnet/CMakeLists.txt
View file

@ -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() set_cpp()

3
base/applications/winhlp32/CMakeLists.txt
View file

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

10
base/shell/explorer/CMakeLists.txt
View file

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

4
lib/3rdparty/stlport/CMakeLists.txt vendored
View file

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

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") set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries")
if(ARCH MATCHES i386) 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 #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
elseif(ARCH MATCHES amd64) 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) endif(ARCH MATCHES i386)
# adjust the default behaviour of the FIND_XXX() commands: # adjust the default behaviour of the FIND_XXX() commands: