[CMAKE]: Build all the remaining host tools/libraries (I think).

[CMAKE]: Fix definitions for some libraries.
[CMAKE]: Build host tools with appropriate flags.

svn path=/branches/cmake-bringup/; revision=48268
This commit is contained in:
Sir Richard 2010-07-25 23:54:32 +00:00
parent 02b1c8a4e2
commit 8235c4622d
9 changed files with 75 additions and 7 deletions

View file

@ -3,11 +3,10 @@ project(REACTOS)
add_definitions(-D__REACTOS__)
#-fshort-wchar
if(NOT CMAKE_CROSSCOMPILING)
add_definitions(-DTARGET_i386)
add_definitions(-fshort-wchar)
include_directories(${REACTOS_SOURCE_DIR}/tools/unicode)
include_directories(./include)
@ -15,6 +14,7 @@ include_directories(./include/reactos)
include_directories(./include/reactos/wine)
add_subdirectory(tools)
add_subdirectory(lib)
export(TARGETS widl wmc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )

View file

@ -1,6 +1,11 @@
add_subdirectory(cmlib)
add_subdirectory(inflib)
add_subdirectory(newinflib)
if(CMAKE_CROSSCOMPILING)
add_subdirectory(atl)
add_subdirectory(cmlib)
add_subdirectory(dnslib)
add_subdirectory(epsapi)
add_subdirectory(lsalib)
@ -9,3 +14,9 @@ add_subdirectory(recyclebin)
add_subdirectory(sdk)
add_subdirectory(smlib)
add_subdirectory(tdilib)
else()
add_subdirectory(host/wcsfuncs)
endif()

View file

@ -1,7 +1,17 @@
add_definitions(-D_NTOSKRNL_ -D_NTSYSTEM_ -DNASSERT)
file(GLOB_RECURSE SOURCE "*.c")
add_library(cmlib ${SOURCE})
add_definitions(-D_NTOSKRNL_ -D_NTSYSTEM_ -DNASSERT)
if(CMAKE_CROSSCOMPILING)
add_library(cmlib ${SOURCE})
else()
add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DCMLIB_HOST)
add_library(cmlibhost ${SOURCE})
target_link_libraries(cmlibhost unicode)
endif()

View file

@ -1,5 +1,7 @@
include_directories(./inc)
add_definitions(-DUNICODE -D_UNICODE)
file(GLOB_RECURSE SOURCE "*.c")
add_library(dnslib ${SOURCE})

View file

@ -0,0 +1,5 @@
file(GLOB_RECURSE SOURCE "*.c")
add_library(host_wcsfuncs ${SOURCE})

18
lib/inflib/CMakeLists.txt Normal file
View file

@ -0,0 +1,18 @@
include_directories(.)
SET(GLOBAL_FILES infcore.c infget.c infput.c)
if(CMAKE_CROSSCOMPILING)
file(GLOB_RECURSE SOURCE "infros*.c")
add_library(inflib ${GLOBAL_FILES} ${SOURCE})
else()
file(GLOB_RECURSE SOURCE "infhost*.c")
add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST)
add_definitions(-Wpointer-arith -Wconversion -Wstrict-prototypes -Wmissing-prototypes)
add_library(inflibhost ${GLOBAL_FILES} ${SOURCE})
endif()

View file

@ -0,0 +1,20 @@
include_directories(.)
SET(GLOBAL_FILES infcore.c infget.c infput.c)
if(CMAKE_CROSSCOMPILING)
file(GLOB_RECURSE SOURCE "infros*.c")
add_library(newinflib ${GLOBAL_FILES} ${SOURCE})
else()
file(GLOB_RECURSE SOURCE "infhost*.c")
add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST -DUSE_HOST_WCSFUNCS)
add_definitions(-Wpointer-arith -Wwrite-strings)
add_library(newinflibhost ${GLOBAL_FILES} ${SOURCE})
target_link_libraries(newinflibhost unicode)
endif()

View file

@ -1,3 +1,4 @@
add_definitions(-DUNICODE -D_UNICODE)
file(GLOB_RECURSE SOURCE "*.c")

View file

@ -1,3 +1,4 @@
add_definitions(-DUNICODE -D_UNICODE)
file(GLOB_RECURSE SOURCE "*.c")