Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 18:11:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Delete an unneeded lib.mak
- Don't build bin2c, we don't seem to need it.
- A minor cleanup, no functionality change intended.

svn path=/branches/cmake-bringup/; revision=50308
This commit is contained in:
Amine Khaldi 2011-01-07 12:11:46 +00:00
parent 24511aea48
commit a0cb4ff5eb
20 changed files with 326 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/3rdparty/mingw/CMakeLists.txt vendored
View file

@ -4,8 +4,8 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/mingw-w64)
add_definitions(-D_CRTBLD)
if(NOT MSVC)
add_definitions(-Wno-main)
endif(NOT MSVC)
add_definitions(-Wno-main)
endif()
list(APPEND MINGW_COMMON_SOURCE
_newmode.c
@ -36,16 +36,16 @@ list(APPEND MINGW_COMMON_SOURCE
cxa_pure_virtual.c)
if(MSVC)
list(APPEND MINGW_COMMON_SOURCE mscmain.c)
list(APPEND MINGW_COMMON_SOURCE mscmain.c)
else()
list(APPEND MINGW_COMMON_SOURCE gccmain.c)
list(APPEND MINGW_COMMON_SOURCE gccmain.c)
endif()
add_library(mingw_common ${MINGW_COMMON_SOURCE})
if(NOT MSVC)
target_link_libraries(mingw_common oldnames)
endif(NOT MSVC)
endif()
set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)
add_dependencies(mingw_common psdk)
@ -62,15 +62,15 @@ add_definitions(-DCRTDLL -D_WINDOWS_)
add_library(mingw_dllmain crtdll.c dllargv.c)
add_dependencies(mingw_dllmain psdk)
if (NOT MSVC)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a
COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a
COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a)
if(NOT MSVC)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a
COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/moldname-msvcrt.def --kill-at --output-lib ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a
COMMAND ${MINGW_PREFIX}ar -rc ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a)
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE)
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a PROPERTIES GENERATED TRUE)
add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a)
add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a)
endif()
add_library(getopt getopt.c)