7 Jan
2011
7 Jan
'11
12:11 p.m.
Author: akhaldi
Date: Fri Jan 7 12:11:46 2011
New Revision: 50308
URL: http://svn.reactos.org/svn/reactos?rev=50308&view=rev
Log:
[CMAKE]
- Delete an unneeded lib.mak
- Don't build bin2c, we don't seem to need it.
- A minor cleanup, no functionality change intended.
Removed:
branches/cmake-bringup/lib/lib.mak
Modified:
branches/cmake-bringup/lib/3rdparty/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt
branches/cmake-bringup/lib/atl/CMakeLists.txt
branches/cmake-bringup/lib/cmlib/CMakeLists.txt
branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt
branches/cmake-bringup/lib/inflib/CMakeLists.txt
branches/cmake-bringup/lib/newinflib/CMakeLists.txt
branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt
branches/cmake-bringup/lib/pseh/CMakeLists.txt
branches/cmake-bringup/lib/recyclebin/CMakeLists.txt
branches/cmake-bringup/lib/rossym/CMakeLists.txt
branches/cmake-bringup/lib/rtl/CMakeLists.txt
branches/cmake-bringup/lib/sdk/CMakeLists.txt
branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt
branches/cmake-bringup/lib/smlib/CMakeLists.txt
branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt
branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt
branches/cmake-bringup/tools/CMakeLists.txt
Modified: branches/cmake-bringup/lib/3rdparty/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/CMak…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46
2011
@@ -12,4 +12,4 @@
add_subdirectory(libxml2)
add_subdirectory(mingw)
add_subdirectory(stlport)
-add_subdirectory(zlib)
+add_subdirectory(zlib)
Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Fri Jan 7
12:11:46 2011
@@ -21,4 +21,4 @@
src/types.c)
add_library(adns ${SOURCE})
-add_dependencies(adns psdk)
+add_dependencies(adns psdk)
Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/ming…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Fri Jan 7
12:11:46 2011
@@ -4,8 +4,8 @@
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 @@
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_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)
Modified: branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/zlib…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/zlib/CMakeLists.txt [iso-8859-1] Fri Jan 7
12:11:46 2011
@@ -19,7 +19,7 @@
zutil.c)
if(CMAKE_CROSSCOMPILING)
-add_library(zlib ${SOURCE})
+ add_library(zlib ${SOURCE})
else()
-add_library(zlibhost ${SOURCE})
+ add_library(zlibhost ${SOURCE})
endif()
Modified: branches/cmake-bringup/lib/atl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/atl/CMakeList…
==============================================================================
--- branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011
@@ -1,5 +1,6 @@
-add_definitions(-DUNICODE -D_UNICODE)
-add_definitions(-DROS_Headers)
+add_definitions(
+ -DUNICODE -D_UNICODE
+ -DROS_Headers)
-add_library(atlnew atlbase.cpp atlcore.cpp)
+add_library(atlnew atlbase.cpp atlcore.cpp)
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] Fri Jan 7 12:11:46 2011
@@ -13,13 +13,13 @@
hivewrt.c)
if(CMAKE_CROSSCOMPILING)
-add_library(cmlib ${SOURCE})
-add_dependencies(cmlib bugcodes)
+ add_library(cmlib ${SOURCE})
+ add_dependencies(cmlib bugcodes)
else()
-add_definitions(
- -DWINE_UNICODE_API=
- -D__NO_CTYPE_INLINES
- -DCMLIB_HOST)
-add_library(cmlibhost ${SOURCE})
-target_link_libraries(cmlibhost unicode)
+ 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/drivers/ip/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/drivers/ip/CM…
==============================================================================
--- branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46
2011
@@ -6,7 +6,7 @@
${REACTOS_SOURCE_DIR}/lib/drivers/oskittcp/include)
if(ARCH MATCHES i386)
-list(APPEND SOURCE network/i386/checksum.S)
+ list(APPEND SOURCE network/i386/checksum.S)
endif()
list(APPEND SOURCE
Modified: 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 [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46
2011
@@ -1,20 +1,15 @@
-SET(GLOBAL_FILES infcore.c infget.c infput.c)
+set(GLOBAL_FILES infcore.c infget.c infput.c)
if(CMAKE_CROSSCOMPILING)
-
-file(GLOB_RECURSE SOURCE "infros*.c")
-add_library(inflib ${GLOBAL_FILES} ${SOURCE})
-add_dependencies(inflib psdk)
-
+ file(GLOB_RECURSE SOURCE "infros*.c")
+ add_library(inflib ${GLOBAL_FILES} ${SOURCE})
+ add_dependencies(inflib psdk)
else()
-
-file(GLOB_RECURSE SOURCE "infhost*.c")
-
-add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST)
-if(NOT MSVC)
-add_definitions(-Wpointer-arith -Wconversion -Wstrict-prototypes -Wmissing-prototypes)
+ file(GLOB_RECURSE SOURCE "infhost*.c")
+ add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST)
+ if(NOT MSVC)
+ add_definitions(-Wpointer-arith -Wconversion -Wstrict-prototypes
-Wmissing-prototypes)
+ endif()
+ add_library(inflibhost ${GLOBAL_FILES} ${SOURCE})
endif()
-add_library(inflibhost ${GLOBAL_FILES} ${SOURCE})
-
-endif()
Removed: branches/cmake-bringup/lib/lib.mak
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/lib.mak?rev=5…
==============================================================================
--- branches/cmake-bringup/lib/lib.mak [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/lib.mak (removed)
@@ -1,7 +1,0 @@
-LIB_BASE = lib
-LIB_BASE_ = $(LIB_BASE)$(SEP)
-
-include lib/inflib/inflib.mak
-ifeq ($(ARCH),powerpc)
-include lib/ppcmmu/ppcmmu.mak
-endif
Modified: 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 [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46
2011
@@ -1,22 +1,16 @@
-SET(GLOBAL_FILES infcore.c infget.c infput.c)
+set(GLOBAL_FILES infcore.c infget.c infput.c)
if(CMAKE_CROSSCOMPILING)
-
-file(GLOB_RECURSE SOURCE "infros*.c")
-add_library(newinflib ${GLOBAL_FILES} ${SOURCE})
-add_dependencies(newinflib psdk)
-
+ file(GLOB_RECURSE SOURCE "infros*.c")
+ add_library(newinflib ${GLOBAL_FILES} ${SOURCE})
+ add_dependencies(newinflib psdk)
else()
-
-file(GLOB_RECURSE SOURCE "infhost*.c")
-
-add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST
-DUSE_HOST_WCSFUNCS)
-if(NOT MSVC)
-add_definitions(-Wpointer-arith -Wwrite-strings)
+ file(GLOB_RECURSE SOURCE "infhost*.c")
+ add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST
-DUSE_HOST_WCSFUNCS)
+ if(NOT MSVC)
+ add_definitions(-Wpointer-arith -Wwrite-strings)
+ endif()
+ add_library(newinflibhost ${GLOBAL_FILES} ${SOURCE})
+ target_link_libraries(newinflibhost unicode)
endif()
-add_library(newinflibhost ${GLOBAL_FILES} ${SOURCE})
-target_link_libraries(newinflibhost unicode)
-
-endif()
-
Modified: branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ppcmmu/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/ppcmmu/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46
2011
@@ -2,8 +2,7 @@
list(APPEND SOURCE dummy.c)
if(ARCH MATCHES powerpc)
-list(APPEND SOURCE
- mmuutil.c)
-endif(ARCH MATCHES powerpc)
+ list(APPEND SOURCE mmuutil.c)
+endif()
add_library(ppcmmu ${SOURCE})
Modified: branches/cmake-bringup/lib/pseh/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/pseh/CMakeLis…
==============================================================================
--- branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/pseh/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011
@@ -1,20 +1,19 @@
if(NOT MSVC)
-list(APPEND SOURCE framebased.c)
+ list(APPEND SOURCE framebased.c)
+ if(ARCH MATCHES i386)
+ list(APPEND SOURCE
+ i386/framebased.S
+ i386/framebased-gcchack.c
+ i386/framebased-gcchack-asm.S)
+ elseif(ARCH MATCHES amd64)
+ list(APPEND SOURCE amd64/framebased.S)
+ elseif(ARCH MATCHES powerpc)
+ list(APPEND SOURCE powerpc/framebased.S)
+ endif()
-if(ARCH MATCHES i386)
-list(APPEND SOURCE
- i386/framebased.S
- i386/framebased-gcchack.c
- i386/framebased-gcchack-asm.S)
-elseif(ARCH MATCHES amd64)
-list(APPEND SOURCE amd64/framebased.S)
-elseif(ARCH MATCHES powerpc)
-list(APPEND SOURCE powerpc/framebased.S)
-endif(ARCH MATCHES i386)
-
-add_library(pseh ${SOURCE})
-add_dependencies(pseh psdk)
+ add_library(pseh ${SOURCE})
+ add_dependencies(pseh psdk)
endif()
Modified: branches/cmake-bringup/lib/recyclebin/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/recyclebin/CM…
==============================================================================
--- branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/recyclebin/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46
2011
@@ -7,4 +7,4 @@
recyclebin_v5.c
recyclebin_v5_enumerator.c)
-add_library(recyclebin ${SOURCE})
+add_library(recyclebin ${SOURCE})
Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL…
==============================================================================
--- branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46
2011
@@ -19,4 +19,4 @@
pe.c
zwfile.c)
add_library(rossym ${SOURCE})
-add_dependencies(rossym psdk)
+add_dependencies(rossym psdk)
Modified: branches/cmake-bringup/lib/rtl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/CMakeList…
==============================================================================
--- branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/rtl/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011
@@ -66,39 +66,38 @@
workitem.c)
if(ARCH MATCHES i386)
-list(APPEND SOURCE
- i386/debug_asm.S
- i386/except_asm.s
- i386/except.c
- i386/interlck.S
- i386/rtlmem.s
- i386/res_asm.s
- i386/thread.c)
+ list(APPEND SOURCE
+ i386/debug_asm.S
+ i386/except_asm.s
+ i386/except.c
+ i386/interlck.S
+ i386/rtlmem.s
+ i386/res_asm.s
+ i386/thread.c)
elseif(ARCH MATCHES amd64)
-list(APPEND SOURCE
- amd64/debug_asm.S
- amd64/except_asm.S
- amd64/slist.S
- amd64/unwind.c
- amd64/stubs.c
- mem.c
- memgen.c)
+ list(APPEND SOURCE
+ amd64/debug_asm.S
+ amd64/except_asm.S
+ amd64/slist.S
+ amd64/unwind.c
+ amd64/stubs.c
+ mem.c
+ memgen.c)
elseif(ARCH MATCHES arm)
-list(APPEND SOURCE
- arm/debug_asm.S
- mem.c
- memgen.c)
+ list(APPEND SOURCE
+ arm/debug_asm.S
+ mem.c
+ memgen.c)
elseif(ARCH MATCHES powerpc)
-list(APPEND SOURCE
- powerpc/debug.c
- powerpc/except.c
- powerpc/interlocked.c
- powerpc/rtlmem.s
- powerpc/rtlswap.s
- powerpc/thread.c)
-endif(ARCH MATCHES i386)
+ list(APPEND SOURCE
+ powerpc/debug.c
+ powerpc/except.c
+ powerpc/interlocked.c
+ powerpc/rtlmem.s
+ powerpc/rtlswap.s
+ powerpc/thread.c)
+endif()
add_library(rtl ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch ${SOURCE})
add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE})
add_dependencies(rtl psdk asm)
-
Modified: branches/cmake-bringup/lib/sdk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/CMakeList…
==============================================================================
--- branches/cmake-bringup/lib/sdk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011
@@ -7,4 +7,4 @@
add_subdirectory(scrnsave)
add_subdirectory(strmiids)
add_subdirectory(uuid)
-add_subdirectory(wdmguid)
+add_subdirectory(wdmguid)
Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake…
==============================================================================
--- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46
2011
@@ -280,139 +280,139 @@
wine/undname.c)
if(NOT ARCH MATCHES arm)
-list(APPEND CRT_SOURCE
- except/${ARCH}/seh.s)
+ list(APPEND CRT_SOURCE
+ except/${ARCH}/seh.s)
endif()
if(ARCH MATCHES i386)
-list(APPEND CRT_SOURCE
- except/i386/chkstk_asm.s
- except/i386/prolog.s
- except/i386/unwind.c
- float/i386/clearfp.c
- float/i386/cntrlfp.c
- float/i386/fpreset.c
- float/i386/logb.c
- float/i386/statfp.c
- setjmp/i386/setjmp.s)
+ list(APPEND CRT_SOURCE
+ except/i386/chkstk_asm.s
+ except/i386/prolog.s
+ except/i386/unwind.c
+ float/i386/clearfp.c
+ float/i386/cntrlfp.c
+ float/i386/fpreset.c
+ float/i386/logb.c
+ float/i386/statfp.c
+ setjmp/i386/setjmp.s)
elseif(ARCH MATCHES amd64)
-list(APPEND CRT_SOURCE
- except/amd64/chkstk_asm.s
- float/i386/clearfp.c
- float/i386/cntrlfp.c
- float/i386/fpreset.c
- float/i386/logb.c
- float/i386/statfp.c
- setjmp/amd64/setjmp.s)
+ list(APPEND CRT_SOURCE
+ except/amd64/chkstk_asm.s
+ float/i386/clearfp.c
+ float/i386/cntrlfp.c
+ float/i386/fpreset.c
+ float/i386/logb.c
+ float/i386/statfp.c
+ setjmp/amd64/setjmp.s)
endif()
if(ARCH MATCHES i386)
-list(APPEND CRT_SOURCE
- math/i386/alldiv_asm.s
- math/i386/alldvrm_asm.s
- math/i386/allmul_asm.s
- math/i386/allrem_asm.s
- math/i386/allshl_asm.s
- math/i386/allshr_asm.s
- math/i386/atan_asm.s
- math/i386/aulldiv_asm.s
- math/i386/aulldvrm_asm.s
- math/i386/aullrem_asm.s
- math/i386/aullshr_asm.s
- math/i386/ceil_asm.s
- math/i386/ceilf.S
- math/i386/cos_asm.s
- math/i386/fabs_asm.s
- math/i386/floor_asm.s
- math/i386/floorf.S
- math/i386/ftol_asm.s
- math/i386/log_asm.s
- math/i386/log10_asm.s
- math/i386/pow_asm.s
- math/i386/sin_asm.s
- math/i386/sqrt_asm.s
- math/i386/tan_asm.s
- math/i386/atan2_asm.s
- math/i386/ci.c
- math/i386/exp_asm.s
- math/i386/fmod_asm.s
- math/i386/fmodf_asm.s
- math/i386/ldexp.c
- mem/i386/memchr_asm.s
- mem/i386/memmove_asm.s
- mem/i386/memset_asm.s
- misc/i386/readcr4.S
- string/i386/strcat_asm.s
- string/i386/strchr_asm.s
- string/i386/strcmp_asm.s
- string/i386/strcpy_asm.s
- string/i386/strlen_asm.s
- string/i386/strncat_asm.s
- string/i386/strncmp_asm.s
- string/i386/strncpy_asm.s
- string/i386/strnlen_asm.s
- string/i386/strrchr_asm.s
- string/i386/wcscat_asm.s
- string/i386/wcschr_asm.s
- string/i386/wcscmp_asm.s
- string/i386/wcscpy_asm.s
- string/i386/wcslen_asm.s
- string/i386/wcsncat_asm.s
- string/i386/wcsncmp_asm.s
- string/i386/wcsncpy_asm.s
- string/i386/wcsnlen_asm.s
- string/i386/wcsrchr_asm.s)
+ list(APPEND CRT_SOURCE
+ math/i386/alldiv_asm.s
+ math/i386/alldvrm_asm.s
+ math/i386/allmul_asm.s
+ math/i386/allrem_asm.s
+ math/i386/allshl_asm.s
+ math/i386/allshr_asm.s
+ math/i386/atan_asm.s
+ math/i386/aulldiv_asm.s
+ math/i386/aulldvrm_asm.s
+ math/i386/aullrem_asm.s
+ math/i386/aullshr_asm.s
+ math/i386/ceil_asm.s
+ math/i386/ceilf.S
+ math/i386/cos_asm.s
+ math/i386/fabs_asm.s
+ math/i386/floor_asm.s
+ math/i386/floorf.S
+ math/i386/ftol_asm.s
+ math/i386/log_asm.s
+ math/i386/log10_asm.s
+ math/i386/pow_asm.s
+ math/i386/sin_asm.s
+ math/i386/sqrt_asm.s
+ math/i386/tan_asm.s
+ math/i386/atan2_asm.s
+ math/i386/ci.c
+ math/i386/exp_asm.s
+ math/i386/fmod_asm.s
+ math/i386/fmodf_asm.s
+ math/i386/ldexp.c
+ mem/i386/memchr_asm.s
+ mem/i386/memmove_asm.s
+ mem/i386/memset_asm.s
+ misc/i386/readcr4.S
+ string/i386/strcat_asm.s
+ string/i386/strchr_asm.s
+ string/i386/strcmp_asm.s
+ string/i386/strcpy_asm.s
+ string/i386/strlen_asm.s
+ string/i386/strncat_asm.s
+ string/i386/strncmp_asm.s
+ string/i386/strncpy_asm.s
+ string/i386/strnlen_asm.s
+ string/i386/strrchr_asm.s
+ string/i386/wcscat_asm.s
+ string/i386/wcschr_asm.s
+ string/i386/wcscmp_asm.s
+ string/i386/wcscpy_asm.s
+ string/i386/wcslen_asm.s
+ string/i386/wcsncat_asm.s
+ string/i386/wcsncmp_asm.s
+ string/i386/wcsncpy_asm.s
+ string/i386/wcsnlen_asm.s
+ string/i386/wcsrchr_asm.s)
else()
-list(APPEND CRT_SOURCE
- math/stubs.c
- mem/memchr.c
- mem/memcpy.c
- mem/memmove.c
- mem/memset.c
- string/strcat.c
- string/strchr.c
- string/strcmp.c
- string/strcpy.c
- string/strlen.c
- string/strncat.c
- string/strncmp.c
- string/strncpy.c
- string/strnlen.c
- string/strrchr.c
- string/wcscat.c
- string/wcschr.c
- string/wcscmp.c
- string/wcscpy.c
- string/wcslen.c
- string/wcsncat.c
- string/wcsncmp.c
- string/wcsncpy.c
- string/wcsnlen.c
- string/wcsrchr.c)
+ list(APPEND CRT_SOURCE
+ math/stubs.c
+ mem/memchr.c
+ mem/memcpy.c
+ mem/memmove.c
+ mem/memset.c
+ string/strcat.c
+ string/strchr.c
+ string/strcmp.c
+ string/strcpy.c
+ string/strlen.c
+ string/strncat.c
+ string/strncmp.c
+ string/strncpy.c
+ string/strnlen.c
+ string/strrchr.c
+ string/wcscat.c
+ string/wcschr.c
+ string/wcscmp.c
+ string/wcscpy.c
+ string/wcslen.c
+ string/wcsncat.c
+ string/wcsncmp.c
+ string/wcsncpy.c
+ string/wcsnlen.c
+ string/wcsrchr.c)
endif()
if(ARCH MATCHES amd64)
-list(APPEND CRT_SOURCE
- math/cos.c
- math/sin.c
- math/amd64/alldiv.S
- math/amd64/atan.S
- math/amd64/atan2.S
- math/amd64/ceil.S
- math/amd64/ceilf.S
- math/amd64/exp.S
- math/amd64/fabs.S
- math/amd64/floor.S
- math/amd64/floorf.S
- math/amd64/fmod.S
- math/amd64/fmodf.S
- math/amd64/ldexp.S
- math/amd64/log.S
- math/amd64/log10.S
- math/amd64/pow.S
- math/amd64/sqrt.S
- math/amd64/sqrtf.S
- math/amd64/tan.S)
+ list(APPEND CRT_SOURCE
+ math/cos.c
+ math/sin.c
+ math/amd64/alldiv.S
+ math/amd64/atan.S
+ math/amd64/atan2.S
+ math/amd64/ceil.S
+ math/amd64/ceilf.S
+ math/amd64/exp.S
+ math/amd64/fabs.S
+ math/amd64/floor.S
+ math/amd64/floorf.S
+ math/amd64/fmod.S
+ math/amd64/fmodf.S
+ math/amd64/ldexp.S
+ math/amd64/log.S
+ math/amd64/log10.S
+ math/amd64/pow.S
+ math/amd64/sqrt.S
+ math/amd64/sqrtf.S
+ math/amd64/tan.S)
endif()
add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE})
@@ -471,109 +471,109 @@
wstring/wcsstr.c)
if(NOT ARCH MATCHES arm)
-list(APPEND LIBCNTPR_SOURCE
- except/${ARCH}/chkstk_asm.s
- except/${ARCH}/seh.s
- setjmp/${ARCH}/setjmp.s)
+ list(APPEND LIBCNTPR_SOURCE
+ except/${ARCH}/chkstk_asm.s
+ except/${ARCH}/seh.s
+ setjmp/${ARCH}/setjmp.s)
endif()
if(ARCH MATCHES i386)
-list(APPEND LIBCNTPR_SOURCE
- math/i386/alldiv_asm.s
- math/i386/alldvrm_asm.s
- math/i386/allmul_asm.s
- math/i386/allrem_asm.s
- math/i386/allshl_asm.s
- math/i386/allshr_asm.s
- math/i386/atan_asm.s
- math/i386/aulldiv_asm.s
- math/i386/aulldvrm_asm.s
- math/i386/aullrem_asm.s
- math/i386/aullshr_asm.s
- math/i386/ceil_asm.s
- math/i386/cos_asm.s
- math/i386/fabs_asm.s
- math/i386/floor_asm.s
- math/i386/ftol_asm.s
- math/i386/ftol2_asm.s
- math/i386/log_asm.s
- math/i386/pow_asm.s
- math/i386/sin_asm.s
- math/i386/sqrt_asm.s
- math/i386/tan_asm.s
- math/i386/ci.c
- misc/i386/readcr4.S)
+ list(APPEND LIBCNTPR_SOURCE
+ math/i386/alldiv_asm.s
+ math/i386/alldvrm_asm.s
+ math/i386/allmul_asm.s
+ math/i386/allrem_asm.s
+ math/i386/allshl_asm.s
+ math/i386/allshr_asm.s
+ math/i386/atan_asm.s
+ math/i386/aulldiv_asm.s
+ math/i386/aulldvrm_asm.s
+ math/i386/aullrem_asm.s
+ math/i386/aullshr_asm.s
+ math/i386/ceil_asm.s
+ math/i386/cos_asm.s
+ math/i386/fabs_asm.s
+ math/i386/floor_asm.s
+ math/i386/ftol_asm.s
+ math/i386/ftol2_asm.s
+ math/i386/log_asm.s
+ math/i386/pow_asm.s
+ math/i386/sin_asm.s
+ math/i386/sqrt_asm.s
+ math/i386/tan_asm.s
+ math/i386/ci.c
+ misc/i386/readcr4.S)
elseif(ARCH MATCHES amd64)
-list(APPEND LIBCNTPR_SOURCE
- math/cos.c
- math/sin.c
- math/amd64/alldiv.S
- math/amd64/atan.S
- math/amd64/atan2.S
- math/amd64/ceil.S
- math/amd64/exp.S
- math/amd64/fabs.S
- math/amd64/floor.S
- math/amd64/fmod.S
- math/amd64/ldexp.S
- math/amd64/log.S
- math/amd64/log10.S
- math/amd64/pow.S
- math/amd64/sqrt.S
- math/amd64/tan.S)
+ list(APPEND LIBCNTPR_SOURCE
+ math/cos.c
+ math/sin.c
+ math/amd64/alldiv.S
+ math/amd64/atan.S
+ math/amd64/atan2.S
+ math/amd64/ceil.S
+ math/amd64/exp.S
+ math/amd64/fabs.S
+ math/amd64/floor.S
+ math/amd64/fmod.S
+ math/amd64/ldexp.S
+ math/amd64/log.S
+ math/amd64/log10.S
+ math/amd64/pow.S
+ math/amd64/sqrt.S
+ math/amd64/tan.S)
endif()
if(ARCH MATCHES i386)
-list(APPEND LIBCNTPR_SOURCE
- mem/i386/memchr_asm.s
- mem/i386/memmove_asm.s
- mem/i386/memset_asm.s
- string/i386/strcat_asm.s
- string/i386/strchr_asm.s
- string/i386/strcmp_asm.s
- string/i386/strcpy_asm.s
- string/i386/strlen_asm.s
- string/i386/strncat_asm.s
- string/i386/strncmp_asm.s
- string/i386/strncpy_asm.s
- string/i386/strnlen_asm.s
- string/i386/strrchr_asm.s
- string/i386/wcscat_asm.s
- string/i386/wcschr_asm.s
- string/i386/wcscmp_asm.s
- string/i386/wcscpy_asm.s
- string/i386/wcslen_asm.s
- string/i386/wcsncat_asm.s
- string/i386/wcsncmp_asm.s
- string/i386/wcsncpy_asm.s
- string/i386/wcsnlen_asm.s
- string/i386/wcsrchr_asm.s)
+ list(APPEND LIBCNTPR_SOURCE
+ mem/i386/memchr_asm.s
+ mem/i386/memmove_asm.s
+ mem/i386/memset_asm.s
+ string/i386/strcat_asm.s
+ string/i386/strchr_asm.s
+ string/i386/strcmp_asm.s
+ string/i386/strcpy_asm.s
+ string/i386/strlen_asm.s
+ string/i386/strncat_asm.s
+ string/i386/strncmp_asm.s
+ string/i386/strncpy_asm.s
+ string/i386/strnlen_asm.s
+ string/i386/strrchr_asm.s
+ string/i386/wcscat_asm.s
+ string/i386/wcschr_asm.s
+ string/i386/wcscmp_asm.s
+ string/i386/wcscpy_asm.s
+ string/i386/wcslen_asm.s
+ string/i386/wcsncat_asm.s
+ string/i386/wcsncmp_asm.s
+ string/i386/wcsncpy_asm.s
+ string/i386/wcsnlen_asm.s
+ string/i386/wcsrchr_asm.s)
else()
-list(APPEND LIBCNTPR_SOURCE
- mem/memchr.c
- mem/memcpy.c
- mem/memmove.c
- mem/memset.c
- string/strcat.c
- string/strchr.c
- string/strcmp.c
- string/strcpy.c
- string/strlen.c
- string/strncat.c
- string/strncmp.c
- string/strncpy.c
- string/strnlen.c
- string/strrchr.c
- string/wcscat.c
- string/wcschr.c
- string/wcscmp.c
- string/wcscpy.c
- string/wcslen.c
- string/wcsncat.c
- string/wcsncmp.c
- string/wcsncpy.c
- string/wcsnlen.c
- string/wcsrchr.c)
+ list(APPEND LIBCNTPR_SOURCE
+ mem/memchr.c
+ mem/memcpy.c
+ mem/memmove.c
+ mem/memset.c
+ string/strcat.c
+ string/strchr.c
+ string/strcmp.c
+ string/strcpy.c
+ string/strlen.c
+ string/strncat.c
+ string/strncmp.c
+ string/strncpy.c
+ string/strnlen.c
+ string/strrchr.c
+ string/wcscat.c
+ string/wcschr.c
+ string/wcscmp.c
+ string/wcscpy.c
+ string/wcslen.c
+ string/wcsncat.c
+ string/wcsncmp.c
+ string/wcsncpy.c
+ string/wcsnlen.c
+ string/wcsrchr.c)
endif()
add_library(libcntpr ${LIBCNTPR_SOURCE})
@@ -582,11 +582,11 @@
if(MSVC)
# This is a temporary solution until we have proper crt libs
-list(APPEND MSVCSUP_SOURCE
- misc/fltused.c
- except/i386/chkstk_asm.s
- math/i386/ftol2_asm.S)
-
-add_library(msvcsup ${MSVCSUP_SOURCE})
-add_dependencies(msvcsup psdk buildno_header asm)
-endif()
+ list(APPEND MSVCSUP_SOURCE
+ misc/fltused.c
+ except/i386/chkstk_asm.s
+ math/i386/ftol2_asm.S)
+
+ add_library(msvcsup ${MSVCSUP_SOURCE})
+ add_dependencies(msvcsup psdk buildno_header asm)
+endif()
Modified: branches/cmake-bringup/lib/smlib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/smlib/CMakeLi…
==============================================================================
--- branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/smlib/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011
@@ -1,3 +1,4 @@
+
add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
Modified: branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…
==============================================================================
--- branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] Fri Jan 7
12:11:46 2011
@@ -1,18 +1,16 @@
-include_directories(include)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+include_directories(
+ include
+ ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+ ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
add_executable(csrss csrss.c csrss.rc)
set_module_type(csrss nativecui)
-
target_link_libraries(csrss nt)
-
add_importlibs(csrss ntdll csrsrv)
-
add_dependencies(csrss psdk bugcodes)
+add_cab_target(csrss 1)
add_subdirectory(csrsrv)
add_subdirectory(win32csr)
-add_cab_target(csrss 1)
Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…
==============================================================================
--- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Jan 7
12:11:46 2011
@@ -173,7 +173,7 @@
list(APPEND SOURCE
dib/dib24bppc.c
dib/dib32bppc.c)
-endif(ARCH MATCHES i386)
+endif()
add_library(win32k SHARED
${CMAKE_CURRENT_BINARY_DIR}/win32k_pch.h.gch
@@ -192,4 +192,3 @@
add_dependencies(win32k gendib_generated subsystem_napi)
add_cab_target(win32k 1)
add_importlib_target(win32k.spec win32k.sys)
-
Modified: branches/cmake-bringup/tools/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.…
==============================================================================
--- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Fri Jan 7 12:11:46 2011
@@ -1,6 +1,6 @@
+
add_library(xml xml.cpp)
-add_executable(bin2c bin2c.c)
#add_executable(pefixup pefixup.c)
add_subdirectory(buildno)
@@ -12,12 +12,8 @@
add_subdirectory(nci)
add_subdirectory(spec2def)
add_subdirectory(unicode)
+
if(NOT MSVC)
-#add_subdirectory(rsym)
add_subdirectory(wpp)
-#add_subdirectory(wmc)
add_subdirectory(widl)
-#add_subdirectory(wrc)
-#add_subdirectory(log2lines)
endif()
-