[CMAKE]: Build all the remaining host tools/libraries (I think).
authorSir Richard <sir_richard@svn.reactos.org>
Sun, 25 Jul 2010 23:54:32 +0000 (23:54 +0000)
committerSir Richard <sir_richard@svn.reactos.org>
Sun, 25 Jul 2010 23:54:32 +0000 (23:54 +0000)
[CMAKE]: Fix definitions for some libraries.
[CMAKE]: Build host tools with appropriate flags.

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

CMakeLists.txt
lib/CMakeLists.txt
lib/cmlib/CMakeLists.txt
lib/dnslib/CMakeLists.txt
lib/host/wcsfuncs/CMakeLists.txt [new file with mode: 0644]
lib/inflib/CMakeLists.txt [new file with mode: 0644]
lib/newinflib/CMakeLists.txt [new file with mode: 0644]
lib/sdk/delayimp/CMakeLists.txt
lib/sdk/scrnsave/CMakeLists.txt

index a46afab..85f1b72 100644 (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- )
 
index e14cd34..b517bc3 100644 (file)
@@ -1,6 +1,11 @@
 
-add_subdirectory(atl)
 add_subdirectory(cmlib)
+add_subdirectory(inflib)
+add_subdirectory(newinflib)
+
+if(CMAKE_CROSSCOMPILING)
+
+add_subdirectory(atl)
 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()
\ No newline at end of file
index 013e55e..41b1ccc 100644 (file)
@@ -1,7 +1,17 @@
 
+file(GLOB_RECURSE SOURCE "*.c")
 
 add_definitions(-D_NTOSKRNL_ -D_NTSYSTEM_ -DNASSERT)
 
-file(GLOB_RECURSE SOURCE "*.c")
+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()
 
-add_library(cmlib ${SOURCE})
\ No newline at end of file
index 2c0855f..9aea3dd 100644 (file)
@@ -1,5 +1,7 @@
 include_directories(./inc)
 
+add_definitions(-DUNICODE -D_UNICODE)
+
 file(GLOB_RECURSE SOURCE "*.c")
 
 add_library(dnslib ${SOURCE})
\ No newline at end of file
diff --git a/lib/host/wcsfuncs/CMakeLists.txt b/lib/host/wcsfuncs/CMakeLists.txt
new file mode 100644 (file)
index 0000000..791b9cc
--- /dev/null
@@ -0,0 +1,5 @@
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(host_wcsfuncs ${SOURCE})
+
diff --git a/lib/inflib/CMakeLists.txt b/lib/inflib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..3ec95bd
--- /dev/null
@@ -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()
diff --git a/lib/newinflib/CMakeLists.txt b/lib/newinflib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4056790
--- /dev/null
@@ -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()
+
index 0d1deea..5153faf 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-DUNICODE -D_UNICODE)
 
 file(GLOB_RECURSE SOURCE "*.c")
 
index 22b19ae..4e1ee58 100644 (file)
@@ -1,3 +1,4 @@
+add_definitions(-DUNICODE -D_UNICODE)
 
 file(GLOB_RECURSE SOURCE "*.c")