[sir_richard] 48268: [CMAKE]: Build all the remaining host tools/libraries (I think). [CMAKE]: Fix definitions for some libraries. [CMAKE]: Build host tools with appropriate flags. - Ros-diffs

25 Jul 2010

Author: sir_richard
Date: Sun Jul 25 23:54:32 2010
New Revision: 48268

URL: http://svn.reactos.org/svn/reactos?rev=48268&view=rev
Log:
[CMAKE]: Build all the remaining host tools/libraries (I think).
[CMAKE]: Fix definitions for some libraries.
[CMAKE]: Build host tools with appropriate flags.

Added:
    branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt   (with props)
    branches/cmake-bringup/lib/inflib/CMakeLists.txt   (with props)
    branches/cmake-bringup/lib/newinflib/CMakeLists.txt   (with props)
Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/lib/CMakeLists.txt
    branches/cmake-bringup/lib/cmlib/CMakeLists.txt
    branches/cmake-bringup/lib/dnslib/CMakeLists.txt
    branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt
    branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt

Modified: branches/cmake-bringup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re…
==============================================================================

--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:54:32 2010
@@ -3,11 +3,10 @@
 
 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/wine)
 
 add_subdirectory(tools)
+add_subdirectory(lib)
 
 export(TARGETS widl wmc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE
native- )
 

Modified: branches/cmake-bringup/lib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx…
==============================================================================
--- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:54:32 2010
@@ -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(sdk)
 add_subdirectory(smlib)
 add_subdirectory(tdilib)
+
+else()
+
+add_subdirectory(host/wcsfuncs)
+
+endif()

Modified: branches/cmake-bringup/lib/cmlib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/cmlib/CMakeLi…
==============================================================================
--- branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:54:32 2010
@@ -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})
+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()
+

Modified: branches/cmake-bringup/lib/dnslib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/dnslib/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/dnslib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/dnslib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:54:32
2010
@@ -1,4 +1,6 @@
 include_directories(./inc)
+
+add_definitions(-DUNICODE -D_UNICODE)
 
 file(GLOB_RECURSE SOURCE "*.c")
 

Added: branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/host/wcsfuncs…
==============================================================================
--- branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt [iso-8859-1] Sun Jul 25
23:54:32 2010
@@ -1,0 +1,5 @@
+
+file(GLOB_RECURSE SOURCE "*.c")
+
+add_library(host_wcsfuncs ${SOURCE})
+

Propchange: branches/cmake-bringup/lib/host/wcsfuncs/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/lib/inflib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/inflib/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/inflib/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:54:32
2010
@@ -1,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()

Propchange: branches/cmake-bringup/lib/inflib/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/cmake-bringup/lib/newinflib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMa…
==============================================================================
--- branches/cmake-bringup/lib/newinflib/CMakeLists.txt (added)
+++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Sun Jul 25 23:54:32
2010
@@ -1,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()
+

Propchange: branches/cmake-bringup/lib/newinflib/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/delayimp/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] Sun Jul 25
23:54:32 2010
@@ -1,3 +1,4 @@
+add_definitions(-DUNICODE -D_UNICODE)
 
 file(GLOB_RECURSE SOURCE "*.c")
 

Modified: branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/scrnsave/…
==============================================================================
--- branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] Sun Jul 25
23:54:32 2010
@@ -1,3 +1,4 @@
+add_definitions(-DUNICODE -D_UNICODE)
 
 file(GLOB_RECURSE SOURCE "*.c")
 



    