- Remove wpp from build.
- Improve several tools and libs.
- Improve the root cmake file.

svn path=/branches/cmake-bringup/; revision=49492
This commit is contained in:
Amine Khaldi 2010-11-05 18:06:25 +00:00
parent 2901215553
commit c93d1289fd
13 changed files with 297 additions and 220 deletions

View file

@ -1,6 +1,20 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fullfat)
add_definitions(-D__NTDRIVER__)
file(GLOB_RECURSE SOURCE "*.c")
add_library(fullfat ${SOURCE})
list(APPEND SOURCE
ff_blk.c
ff_crc.c
ff_dir.c
ff_error.c
ff_fat.c
ff_file.c
ff_hash.c
ff_ioman.c
ff_memory.c
ff_safety.c
ff_string.c
ff_time.c)
add_library(fullfat ${SOURCE})

View file

@ -1,50 +1,52 @@
include_directories(icu/source/common)
include_directories(icu/source/i18n)
add_definitions(-DHAVE_EXPAT_CONFIG_H)
add_definitions(-DU_STATIC_IMPLEMENTATION)
add_definitions(-DU_HAVE_INTTYPES_H)
add_definitions(-DUCONFIG_NO_FILE_IO=1)
add_definitions(-DICU_NO_USER_DATA_OVERRIDE=1)
include_directories(
icu/source/common
icu/source/i18n)
set(SOURCE
"stubs.cpp"
"icu/source/common/bmpset.cpp"
"icu/source/common/uhash_us.cpp"
"icu/source/common/uidna.cpp"
"icu/source/common/unifilt.cpp"
"icu/source/common/unifunct.cpp"
"icu/source/common/uniset.cpp"
"icu/source/common/unisetspan.cpp"
"icu/source/common/unistr.cpp"
"icu/source/common/unorm.cpp"
"icu/source/common/uobject.cpp"
"icu/source/common/uobject.cpp"
"icu/source/common/uset.cpp"
"icu/source/common/usprep.cpp"
"icu/source/common/uiter.cpp"
"icu/source/common/util.cpp"
"icu/source/common/cmemory.c"
"icu/source/common/cstring.c"
"icu/source/common/locmap.c"
"icu/source/common/punycode.c"
"icu/source/common/ubidi_props.c"
"icu/source/common/ucln_cmn.c"
"icu/source/common/ucmndata.c"
"icu/source/common/ucol_swp.c"
"icu/source/common/udata.c"
"icu/source/common/udatamem.c"
"icu/source/common/udataswp.c"
"icu/source/common/uhash.c"
"icu/source/common/uinit.c"
"icu/source/common/uinvchar.c"
"icu/source/common/umapfile.c"
"icu/source/common/umath.c"
"icu/source/common/umutex.c"
"icu/source/common/ustring.c"
"icu/source/common/ustrtrns.c"
"icu/source/common/utf_impl.c"
"icu/source/common/utrie.c"
)
add_definitions(
-DHAVE_EXPAT_CONFIG_H
-DU_STATIC_IMPLEMENTATION
-DU_HAVE_INTTYPES_H
-DUCONFIG_NO_FILE_IO=1
-DICU_NO_USER_DATA_OVERRIDE=1)
add_library(icu4ros ${SOURCE})
list(APPEND SOURCE
stubs.cpp
icu/source/common/bmpset.cpp
icu/source/common/uhash_us.cpp
icu/source/common/uidna.cpp
icu/source/common/unifilt.cpp
icu/source/common/unifunct.cpp
icu/source/common/uniset.cpp
icu/source/common/unisetspan.cpp
icu/source/common/unistr.cpp
icu/source/common/unorm.cpp
icu/source/common/uobject.cpp
icu/source/common/uobject.cpp
icu/source/common/uset.cpp
icu/source/common/usprep.cpp
icu/source/common/uiter.cpp
icu/source/common/util.cpp
icu/source/common/cmemory.c
icu/source/common/cstring.c
icu/source/common/locmap.c
icu/source/common/punycode.c
icu/source/common/ubidi_props.c
icu/source/common/ucln_cmn.c
icu/source/common/ucmndata.c
icu/source/common/ucol_swp.c
icu/source/common/udata.c
icu/source/common/udatamem.c
icu/source/common/udataswp.c
icu/source/common/uhash.c
icu/source/common/uinit.c
icu/source/common/uinvchar.c
icu/source/common/umapfile.c
icu/source/common/umath.c
icu/source/common/umutex.c
icu/source/common/ustring.c
icu/source/common/ustrtrns.c
icu/source/common/utf_impl.c
icu/source/common/utrie.c)
add_library(icu4ros ${SOURCE})

View file

@ -1,3 +1,4 @@
add_definitions(
-DOPT_I386
-DREAL_IS_FLOAT

View file

@ -1,4 +1,12 @@
add_definitions(-DHAVE_LRINT -DHAVE_LRINTF)
file(GLOB_RECURSE SOURCE "*.c")
add_library(libsamplerate ${SOURCE})
add_definitions(
-DHAVE_LRINT
-DHAVE_LRINTF)
list(APPEND SOURCE
samplerate.c
src_linear.c
src_sinc.c
src_zoh.c)
add_library(libsamplerate ${SOURCE})

View file

@ -1,8 +1,12 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_definitions(-D__WINESRC__)
file(GLOB_RECURSE SOURCE "*.c")
list(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/debug.c)
list(APPEND SOURCE
config.c
debug_ros.c
loader.c
string.c)
add_library(wine ${SOURCE})

View file

@ -1,54 +1,63 @@
include_directories(.)
include_directories(./include)
add_definitions(-D__MINGW32__ -DLIBXML_STATIC -D_REENTRANT -DHAVE_WIN32_THREADS -D_MBCS -D_WINDOWS -DWIN32 -DHAVE_CONFIG_H)
add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(
.
include)
add_definitions(
-D__MINGW32__
-DLIBXML_STATIC
-D_REENTRANT
-DHAVE_WIN32_THREADS
-D_MBCS
-D_WINDOWS
-DWIN32
-DHAVE_CONFIG_H
-D_DLL -D__USE_CRTIMP)
list(APPEND SOURCE
c14n.c
catalog.c
chvalid.c
debugXML.c
dict.c
DOCBparser.c
encoding.c
entities.c
error.c
globals.c
hash.c
HTMLparser.c
HTMLtree.c
legacy.c
list.c
nanoftp.c
nanohttp.c
parser.c
parserInternals.c
pattern.c
relaxng.c
SAX.c
SAX2.c
threads.c
tree.c
uri.c
valid.c
xinclude.c
xlink.c
xmlIO.c
xmlmemory.c
xmlreader.c
xmlregexp.c
xmlmodule.c
xmlsave.c
xmlschemas.c
xmlschemastypes.c
xmlunicode.c
xmlwriter.c
xpath.c
xpointer.c
xmlstring.c
)
c14n.c
catalog.c
chvalid.c
debugXML.c
dict.c
DOCBparser.c
encoding.c
entities.c
error.c
globals.c
hash.c
HTMLparser.c
HTMLtree.c
legacy.c
list.c
nanoftp.c
nanohttp.c
parser.c
parserInternals.c
pattern.c
relaxng.c
SAX.c
SAX2.c
threads.c
tree.c
uri.c
valid.c
xinclude.c
xlink.c
xmlIO.c
xmlmemory.c
xmlreader.c
xmlregexp.c
xmlmodule.c
xmlsave.c
xmlschemas.c
xmlschemastypes.c
xmlunicode.c
xmlwriter.c
xpath.c
xpointer.c
xmlstring.c)
add_library(libxml2 ${SOURCE})
target_link_libraries(libxml2 oldnames)
add_dependencies(libxml2 psdk)
add_dependencies(libxml2 psdk)

View file

@ -8,35 +8,35 @@ add_definitions(-Wno-main)
endif(NOT MSVC)
list(APPEND MINGW_COMMON_SOURCE
_newmode.c
atonexit.c
binmode.c
charmax.c
cinitexe.c
CRT_fp10.c
CRT_fp8.c
CRT_glob.c
crt_handler.c
dllentry.c
gccmain.c
gs_support.c
merr.c
mingw_helpers.c
natstart.c
pesect.c
pseudo-reloc.c
pseudo-reloc-list.c
tlsmcrt.c
tlsmthread.c
tlssup.c
tlsthrd.c
txtmode.c
wildcard.c
xncommod.c
xthdloc.c
xtxtmode.c
ofmt_stub.c
cxa_pure_virtual.c)
_newmode.c
atonexit.c
binmode.c
charmax.c
cinitexe.c
CRT_fp10.c
CRT_fp8.c
CRT_glob.c
crt_handler.c
dllentry.c
gccmain.c
gs_support.c
merr.c
mingw_helpers.c
natstart.c
pesect.c
pseudo-reloc.c
pseudo-reloc-list.c
tlsmcrt.c
tlsmthread.c
tlssup.c
tlsthrd.c
txtmode.c
wildcard.c
xncommod.c
xthdloc.c
xtxtmode.c
ofmt_stub.c
cxa_pure_virtual.c)
add_library(mingw_common ${MINGW_COMMON_SOURCE})

View file

@ -7,37 +7,37 @@ add_definitions(-D_STLP_USE_EXCEPTIONS)
set_cpp()
list(APPEND SOURCE
src/allocators.cpp
src/bitset.cpp
src/codecvt.cpp
src/collate.cpp
src/complex.cpp
src/complex_io.cpp
src/complex_trig.cpp
src/ctype.cpp
src/dll_main.cpp
src/facets_byname.cpp
src/fstream.cpp
src/ios.cpp
src/iostream.cpp
src/istream.cpp
src/locale.cpp
src/locale_catalog.cpp
src/locale_impl.cpp
src/messages.cpp
src/monetary.cpp
src/num_get.cpp
src/num_get_float.cpp
src/num_put.cpp
src/num_put_float.cpp
src/numpunct.cpp
src/ostream.cpp
src/sstream.cpp
src/stdio_streambuf.cpp
src/string.cpp
src/strstream.cpp
src/time_facets.cpp
src/c_locale.c
src/cxa.c)
src/allocators.cpp
src/bitset.cpp
src/codecvt.cpp
src/collate.cpp
src/complex.cpp
src/complex_io.cpp
src/complex_trig.cpp
src/ctype.cpp
src/dll_main.cpp
src/facets_byname.cpp
src/fstream.cpp
src/ios.cpp
src/iostream.cpp
src/istream.cpp
src/locale.cpp
src/locale_catalog.cpp
src/locale_impl.cpp
src/messages.cpp
src/monetary.cpp
src/num_get.cpp
src/num_get_float.cpp
src/num_put.cpp
src/num_put_float.cpp
src/numpunct.cpp
src/ostream.cpp
src/sstream.cpp
src/stdio_streambuf.cpp
src/string.cpp
src/strstream.cpp
src/time_facets.cpp
src/c_locale.c
src/cxa.c)
add_library(stlport ${SOURCE})

View file

@ -1,18 +1,25 @@
file(GLOB_RECURSE SOURCE "*.c")
LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/minigzip.c)
LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/example.c)
add_definitions(-DNO_VIZ)
list(APPEND SOURCE
adler32.c
compress.c
crc32.c
deflate.c
gzclose.c
gzlib.c
gzread.c
gzwrite.c
infback.c
inffast.c
inflate.c
inftrees.c
trees.c
uncompr.c
zutil.c)
if(CMAKE_CROSSCOMPILING)
add_library(zlib ${SOURCE})
else()
add_library(zlibhost ${SOURCE})
endif()