[tkreuzer] 51860: [CMAKE] - Create a new library msvcrtex, which will be automatically linked, when msvcrt is linked. This is yet a minimal version which replaces the different mingw libs. - Use pr...
Author: tkreuzer Date: Mon May 23 15:50:03 2011 New Revision: 51860
URL: http://svn.reactos.org/svn/reactos?rev=51860&view=rev Log: [CMAKE] - Create a new library msvcrtex, which will be automatically linked, when msvcrt is linked. This is yet a minimal version which replaces the different mingw libs. - Use proper unicode entrypoints - remove unneeded libcoldname.a
Added: trunk/reactos/lib/sdk/crt/crt.cmake (with props) trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/ - copied from r51855, trunk/reactos/include/reactos/mingw-w64/ trunk/reactos/lib/sdk/crt/libcntpr.cmake (with props) trunk/reactos/lib/sdk/crt/misc/getopt.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/getopt.c trunk/reactos/lib/sdk/crt/moldname-msvcrt.def - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/moldname-msvcrt.def trunk/reactos/lib/sdk/crt/msvcrtex.cmake (with props) trunk/reactos/lib/sdk/crt/oldnames.cmake (with props) trunk/reactos/lib/sdk/crt/startup/ (with props) trunk/reactos/lib/sdk/crt/startup/_newmode.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/_newmode.c trunk/reactos/lib/sdk/crt/startup/atonexit.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/atonexit.c trunk/reactos/lib/sdk/crt/startup/charmax.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/charmax.c trunk/reactos/lib/sdk/crt/startup/cinitexe.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/cinitexe.c trunk/reactos/lib/sdk/crt/startup/crt0_c.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/crt0_c.c trunk/reactos/lib/sdk/crt/startup/crt0_w.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/crt0_w.c trunk/reactos/lib/sdk/crt/startup/crtexe.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/sdk/crt/startup/dll_argv.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/dll_argv.c trunk/reactos/lib/sdk/crt/startup/dllargv.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/dllargv.c trunk/reactos/lib/sdk/crt/startup/gccmain.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/gccmain.c trunk/reactos/lib/sdk/crt/startup/gs_support.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/gs_support.c trunk/reactos/lib/sdk/crt/startup/merr.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/merr.c trunk/reactos/lib/sdk/crt/startup/mingw_helpers.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/mingw_helpers.c trunk/reactos/lib/sdk/crt/startup/mscmain.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/mscmain.c trunk/reactos/lib/sdk/crt/startup/natstart.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/natstart.c trunk/reactos/lib/sdk/crt/startup/pseudo-reloc.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/pseudo-reloc.c trunk/reactos/lib/sdk/crt/startup/tlsmcrt.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/tlsmcrt.c trunk/reactos/lib/sdk/crt/startup/tlsmthread.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/tlsmthread.c trunk/reactos/lib/sdk/crt/startup/tlssup.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/tlssup.c trunk/reactos/lib/sdk/crt/startup/tlsthrd.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/tlsthrd.c trunk/reactos/lib/sdk/crt/startup/txtmode.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/txtmode.c trunk/reactos/lib/sdk/crt/startup/wcrtexe.c (with props) trunk/reactos/lib/sdk/crt/startup/wdllargv.c (with props) trunk/reactos/lib/sdk/crt/startup/wildcard.c - copied unchanged from r51855, trunk/reactos/lib/3rdparty/mingw/wildcard.c Removed: trunk/reactos/importlibs/libcoldname.a Modified: trunk/reactos/ (props changed) trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/games/solitaire/CMakeLists.txt trunk/reactos/base/applications/games/spider/CMakeLists.txt trunk/reactos/base/applications/network/telnet/CMakeLists.txt trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/gcc.cmake trunk/reactos/lib/3rdparty/CMakeLists.txt trunk/reactos/lib/sdk/crt/CMakeLists.txt
Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 23 15:50:03 2011 @@ -1,3 +1,4 @@ +/branches/cmake-bringup:50484,50693,50719 /branches/header-work:45691-47721 /branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 /branches/reactx/reactos:49994-49995
Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/C... ============================================================================== --- trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -17,6 +17,6 @@
set_module_type(charmap win32gui)
-add_importlibs(charmap user32 gdi32 comctl32 kernel32 msvcrt) +add_importlibs(charmap msvcrt user32 gdi32 comctl32 kernel32)
add_cd_file(TARGET charmap DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -15,6 +15,6 @@
set_module_type(sol win32gui)
-add_importlibs(sol advapi32 comctl32 user32 gdi32 kernel32 msvcrt) +add_importlibs(sol advapi32 comctl32 user32 gdi32 msvcrt kernel32)
add_cd_file(TARGET sol DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/spi... ============================================================================== --- trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -15,6 +15,6 @@
set_module_type(spider win32gui)
-add_importlibs(spider advapi32 comctl32 user32 gdi32 kernel32 msvcrt) +add_importlibs(spider advapi32 comctl32 user32 gdi32 msvcrt kernel32)
add_cd_file(TARGET spider DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/network/telnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -28,5 +28,5 @@ telnet.rc)
set_module_type(telnet win32cui) -add_importlibs(telnet ws2_32 user32 kernel32 msvcrt) +add_importlibs(telnet ws2_32 user32 msvcrt kernel32) add_cd_file(TARGET telnet DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CMa... ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -29,7 +29,7 @@ set_module_type(rapps win32gui) target_link_libraries(rapps uuid)
-add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi kernel32 msvcrt ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi msvcrt kernel32 ntdll) add_dependencies(rapps rappsmsg) add_message_headers(rappsmsg.mc) add_cd_file(TARGET rapps DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/gcc.cmake?rev=51860&r1=... ============================================================================== --- trunk/reactos/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/gcc.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -3,7 +3,7 @@ if(ARCH MATCHES i386) link_directories("${REACTOS_SOURCE_DIR}/importlibs") endif() -link_directories(${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +link_directories(${REACTOS_BINARY_DIR}/lib/sdk/crt) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") @@ -180,25 +180,20 @@ set_entrypoint(${MODULE} NtProcessStartup 4) elseif(${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) - set_entrypoint(${MODULE} WinMainCRTStartup) - if(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_main) + if(IS_UNICODE) + set_entrypoint(${MODULE} wWinMainCRTStartup) else() - target_link_libraries(${MODULE} mingw_wmain) - endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_common) + set_entrypoint(${MODULE} WinMainCRTStartup) + endif(IS_UNICODE) elseif(${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) - set_entrypoint(${MODULE} mainCRTStartup) - if(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_main) + if(IS_UNICODE) + set_entrypoint(${MODULE} wmainCRTStartup) else() - target_link_libraries(${MODULE} mingw_wmain) - endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_common) + set_entrypoint(${MODULE} mainCRTStartup) + endif(IS_UNICODE) elseif(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMain 12) - target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() @@ -206,11 +201,9 @@ endif() elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMain 12) - target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") elseif(${TYPE} MATCHES cpl) set_entrypoint(${MODULE} DllMain 12) - target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") @@ -271,6 +264,9 @@ macro(add_importlibs MODULE) add_dependency_node(${MODULE}) foreach(LIB ${ARGN}) + if ("${LIB}" MATCHES "msvcrt") + target_link_libraries(${MODULE} msvcrtex) + endif() target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.a) add_dependencies(${MODULE} lib${LIB}) add_dependency_edge(${MODULE} ${LIB})
Removed: trunk/reactos/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libcoldname.a?re... ============================================================================== Binary file - no diff available.
Modified: trunk/reactos/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/CMakeLists.txt... ============================================================================== --- trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -10,6 +10,5 @@ add_subdirectory(libsamplerate) add_subdirectory(libwine) add_subdirectory(libxml2) -add_subdirectory(mingw) add_subdirectory(stlport) add_subdirectory(zlib)
Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt?... ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Mon May 23 15:50:03 2011 @@ -3,618 +3,10 @@
add_definitions(-D_CRTBLD)
-list(APPEND CRT_SOURCE - conio/cgets.c - conio/cputs.c - conio/getch.c - conio/getche.c - conio/kbhit.c - conio/putch.c - conio/ungetch.c - direct/chdir.c - direct/chdrive.c - direct/getcwd.c - direct/getdcwd.c - direct/getdfree.c - direct/getdrive.c - direct/mkdir.c - direct/rmdir.c - direct/wchdir.c - direct/wgetcwd.c - direct/wgetdcwd.c - direct/wmkdir.c - direct/wrmdir.c - except/abnorter.c - except/checkesp.c - except/cpp.c - except/cppexcept.c - except/except.c - except/matherr.c - except/xcptfil.c - float/chgsign.c - float/copysign.c - float/fpclass.c - float/fpecode.c - float/isnan.c - float/nafter.c - float/scalb.c - locale/locale.c - math/acos.c - math/adjust.c - math/asin.c - math/cabs.c - math/cosf.c - math/cosh.c - math/div.c - math/fdivbug.c - math/frexp.c - math/huge_val.c - math/hypot.c - math/ldiv.c - math/logf.c - math/modf.c - math/powf.c - math/rand.c - math/sqrtf.c - math/s_modf.c - math/sinf.c - math/sinh.c - math/tanh.c - mbstring/hanzen.c - mbstring/ischira.c - mbstring/iskana.c - mbstring/iskmoji.c - mbstring/iskpun.c - mbstring/islead.c - mbstring/islwr.c - mbstring/ismbal.c - mbstring/ismbaln.c - mbstring/ismbc.c - mbstring/ismbgra.c - mbstring/ismbkaln.c - mbstring/ismblead.c - mbstring/ismbpri.c - mbstring/ismbpun.c - mbstring/ismbtrl.c - mbstring/isuppr.c - mbstring/jistojms.c - mbstring/jmstojis.c - mbstring/mbbtype.c - mbstring/mbccpy.c - mbstring/mbclen.c - mbstring/mbscat.c - mbstring/mbschr.c - mbstring/mbscmp.c - mbstring/mbscoll.c - mbstring/mbscpy.c - mbstring/mbscspn.c - mbstring/mbsdec.c - mbstring/mbsdup.c - mbstring/mbsicmp.c - mbstring/mbsicoll.c - mbstring/mbsinc.c - mbstring/mbslen.c - mbstring/mbslwr.c - mbstring/mbsncat.c - mbstring/mbsnccnt.c - mbstring/mbsncmp.c - mbstring/mbsncoll.c - mbstring/mbsncpy.c - mbstring/mbsnextc.c - mbstring/mbsnicmp.c - mbstring/mbsnicoll.c - mbstring/mbsninc.c - mbstring/mbsnset.c - mbstring/mbspbrk.c - mbstring/mbsrchr.c - mbstring/mbsrev.c - mbstring/mbsset.c - mbstring/mbsspn.c - mbstring/mbsspnp.c - mbstring/mbsstr.c - mbstring/mbstok.c - mbstring/mbstrlen.c - mbstring/mbsupr.c - mem/memcmp.c - mem/memccpy.c - mem/memicmp.c - misc/amsg.c - misc/assert.c - misc/environ.c - misc/getargs.c - misc/i10output.c - misc/initterm.c - misc/lock.c - misc/purecall.c - misc/stubs.c - misc/tls.c - printf/_cprintf.c - printf/_snprintf.c - printf/_snwprintf.c - printf/_vcprintf.c - printf/_vsnprintf.c - printf/_vsnwprintf.c - printf/fprintf.c - printf/fwprintf.c - printf/printf.c - printf/sprintf.c - printf/streamout.c - printf/swprintf.c - printf/vfprintf.c - printf/vfwprintf.c - printf/vprintf.c - printf/vsprintf.c - printf/vswprintf.c - printf/vwprintf.c - printf/wprintf.c - printf/wstreamout.c - process/_cwait.c - process/_system.c - process/dll.c - process/process.c - process/procid.c - process/thread.c - process/threadid.c - process/threadx.c - process/wprocess.c - search/bsearch.c - search/lfind.c - search/lsearch.c - signal/signal.c - signal/xcptinfo.c - stdio/_flsbuf.c - stdio/_flswbuf.c - stdio/access.c - stdio/file.c - stdio/find.c - stdio/find64.c - stdio/findi64.c - stdio/fmode.c - stdio/lock_file.c - stdio/perror.c - stdio/popen.c - stdio/stat.c - stdio/stat64.c - stdio/waccess.c - stdio/wfind.c - stdio/wfind64.c - stdio/wfindi64.c - stdio/wpopen.c - stdio/wstat.c - stdio/wstat64.c - stdlib/_exit.c - stdlib/abort.c - stdlib/atexit.c - stdlib/ecvt.c - stdlib/errno.c - stdlib/fcvt.c - stdlib/fcvtbuf.c - stdlib/fullpath.c - stdlib/gcvt.c - stdlib/getenv.c - stdlib/makepath.c - stdlib/makepath_s.c - stdlib/mbtowc.c - stdlib/mbstowcs.c - stdlib/obsol.c - stdlib/putenv.c - stdlib/qsort.c - stdlib/rot.c - stdlib/senv.c - stdlib/swab.c - stdlib/wfulpath.c - stdlib/wputenv.c - stdlib/wsenv.c - stdlib/wmakpath.c - stdlib/wmakpath_s.c - string/atof.c - string/atoi.c - string/atoi64.c - string/atol.c - string/ctype.c - string/itoa.c - string/itow.c - string/lasttok.c - string/scanf.c - string/splitp.c - string/strcoll.c - string/strcspn.c - string/strdup.c - string/strerror.c - string/stricmp.c - string/string.c - string/strlwr.c - string/strncoll.c - string/strnicmp.c - string/strpbrk.c - string/strrev.c - string/strset.c - string/strspn.c - string/strstr.c - string/strtod.c - string/strtoi64.c - string/strtok.c - string/strtol.c - string/strtoul.c - string/strtoull.c - string/strupr.c - string/strxfrm.c - string/wcs.c - string/wcstol.c - string/wcstoul.c - string/wsplitp.c - string/wtoi.c - string/wtoi64.c - string/wtol.c - sys_stat/systime.c - time/asctime.c - time/clock.c - time/ctime32.c - time/ctime64.c - time/ctime.c - time/difftime32.c - time/difftime64.c - time/difftime.c - time/ftime32.c - time/ftime64.c - time/ftime.c - time/futime32.c - time/futime64.c - time/futime.c - time/gmtime.c - time/localtime32.c - time/localtime64.c - time/localtime.c - time/mktime.c - time/strdate.c - time/strftime.c - time/strtime.c - time/time32.c - time/time64.c - time/time.c - time/timezone.c - time/tzname.c - time/utime32.c - time/utime64.c - time/utime.c - time/wasctime.c - time/wcsftime.c - time/wctime32.c - time/wctime64.c - time/wctime.c - time/wstrdate.c - time/wstrtime.c - time/wutime32.c - time/wutime64.c - time/wutime.c - wstring/wcscoll.c - wstring/wcscspn.c - wstring/wcsicmp.c - wstring/wcslwr.c - wstring/wcsnicmp.c - wstring/wcsspn.c - wstring/wcsstr.c - wstring/wcstok.c - wstring/wcsupr.c - wstring/wcsxfrm.c - wstring/wlasttok.c - wine/heap.c - wine/undname.c) - -if(ARCH MATCHES i386) - list(APPEND CRT_SOURCE - except/i386/chkstk_asm.s - except/i386/prolog.s - except/i386/seh.s - except/i386/seh_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 - except/amd64/seh.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/ftol2_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) -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) -endif() - -add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE}) - -set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) -add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) -add_dependencies(crt psdk asm) - -list(APPEND LIBCNTPR_SOURCE - float/isnan.c - math/abs.c - math/div.c - math/labs.c - math/rand_nt.c - mbstring/mbstrlen.c - mem/memccpy.c - mem/memcmp.c - mem/memicmp.c - printf/_snprintf.c - printf/_snwprintf.c - printf/_vcprintf.c - printf/_vsnprintf.c - printf/_vsnwprintf.c - printf/sprintf.c - printf/streamout.c - printf/swprintf.c - printf/vprintf.c - printf/vsprintf.c - printf/vswprintf.c - printf/wstreamout.c - search/bsearch.c - search/lfind.c - stdlib/qsort.c - string/ctype.c - string/scanf.c - string/strcspn.c - string/stricmp.c - string/strnicmp.c - string/strlwr.c - string/strrev.c - string/strset.c - string/strstr.c - string/strupr.c - string/strpbrk.c - string/strspn.c - string/atoi64.c - string/atoi.c - string/atol.c - string/itoa.c - string/itow.c - string/mbstowcs_nt.c - string/splitp.c - string/strtol.c - string/strtoul.c - string/strtoull.c - string/wcs.c - string/wcstol.c - string/wcstombs_nt.c - string/wcstoul.c - string/wsplitp.c - string/wtoi64.c - string/wtoi.c - string/wtol.c - wstring/wcsicmp.c - wstring/wcslwr.c - wstring/wcsnicmp.c - wstring/wcsupr.c - wstring/wcscspn.c - wstring/wcsspn.c - wstring/wcsstr.c) - -if(ARCH MATCHES i386) - list(APPEND LIBCNTPR_SOURCE - except/i386/chkstk_asm.s - except/i386/seh.s - except/i386/seh_prolog.s - setjmp/i386/setjmp.s - 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/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/ci.c - misc/i386/readcr4.S) -elseif(ARCH MATCHES amd64) - list(APPEND LIBCNTPR_SOURCE - except/amd64/chkstk_asm.s - except/amd64/seh.s - setjmp/amd64/setjmp.s - 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) -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) -endif() - -add_library(libcntpr ${LIBCNTPR_SOURCE}) -set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) -add_dependencies(libcntpr psdk asm) +include(crt.cmake) +include(libcntpr.cmake) +include(msvcrtex.cmake) +include(oldnames.cmake)
if(MSVC) # This is a temporary solution until we have proper crt libs @@ -641,3 +33,7 @@ string/wcstombs_nt.c)
set_property(TARGET user32_wsprintf PROPERTY COMPILE_DEFINITIONS _USER32_WSPRINTF) + +add_library(getopt misc/getopt.c) +set_property(TARGET getopt PROPERTY COMPILE_DEFINITIONS _DLL __USE_CRTIMP) +add_dependencies(getopt psdk)
Added: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=5... ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake (added) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,438 @@ +list(APPEND CRT_SOURCE + conio/cgets.c + conio/cputs.c + conio/getch.c + conio/getche.c + conio/kbhit.c + conio/putch.c + conio/ungetch.c + direct/chdir.c + direct/chdrive.c + direct/getcwd.c + direct/getdcwd.c + direct/getdfree.c + direct/getdrive.c + direct/mkdir.c + direct/rmdir.c + direct/wchdir.c + direct/wgetcwd.c + direct/wgetdcwd.c + direct/wmkdir.c + direct/wrmdir.c + except/abnorter.c + except/checkesp.c + except/cpp.c + except/cppexcept.c + except/except.c + except/matherr.c + except/xcptfil.c + float/chgsign.c + float/copysign.c + float/fpclass.c + float/fpecode.c + float/isnan.c + float/nafter.c + float/scalb.c + locale/locale.c + math/acos.c + math/adjust.c + math/asin.c + math/cabs.c + math/cosf.c + math/cosh.c + math/div.c + math/fdivbug.c + math/frexp.c + math/huge_val.c + math/hypot.c + math/ldiv.c + math/logf.c + math/modf.c + math/powf.c + math/rand.c + math/sqrtf.c + math/s_modf.c + math/sinf.c + math/sinh.c + math/tanh.c + mbstring/hanzen.c + mbstring/ischira.c + mbstring/iskana.c + mbstring/iskmoji.c + mbstring/iskpun.c + mbstring/islead.c + mbstring/islwr.c + mbstring/ismbal.c + mbstring/ismbaln.c + mbstring/ismbc.c + mbstring/ismbgra.c + mbstring/ismbkaln.c + mbstring/ismblead.c + mbstring/ismbpri.c + mbstring/ismbpun.c + mbstring/ismbtrl.c + mbstring/isuppr.c + mbstring/jistojms.c + mbstring/jmstojis.c + mbstring/mbbtype.c + mbstring/mbccpy.c + mbstring/mbclen.c + mbstring/mbscat.c + mbstring/mbschr.c + mbstring/mbscmp.c + mbstring/mbscoll.c + mbstring/mbscpy.c + mbstring/mbscspn.c + mbstring/mbsdec.c + mbstring/mbsdup.c + mbstring/mbsicmp.c + mbstring/mbsicoll.c + mbstring/mbsinc.c + mbstring/mbslen.c + mbstring/mbslwr.c + mbstring/mbsncat.c + mbstring/mbsnccnt.c + mbstring/mbsncmp.c + mbstring/mbsncoll.c + mbstring/mbsncpy.c + mbstring/mbsnextc.c + mbstring/mbsnicmp.c + mbstring/mbsnicoll.c + mbstring/mbsninc.c + mbstring/mbsnset.c + mbstring/mbspbrk.c + mbstring/mbsrchr.c + mbstring/mbsrev.c + mbstring/mbsset.c + mbstring/mbsspn.c + mbstring/mbsspnp.c + mbstring/mbsstr.c + mbstring/mbstok.c + mbstring/mbstrlen.c + mbstring/mbsupr.c + mem/memcmp.c + mem/memccpy.c + mem/memicmp.c + misc/amsg.c + misc/assert.c + misc/environ.c + misc/getargs.c + misc/i10output.c + misc/initterm.c + misc/lock.c + misc/purecall.c + misc/stubs.c + misc/tls.c + printf/_cprintf.c + printf/_snprintf.c + printf/_snwprintf.c + printf/_vcprintf.c + printf/_vsnprintf.c + printf/_vsnwprintf.c + printf/fprintf.c + printf/fwprintf.c + printf/printf.c + printf/sprintf.c + printf/streamout.c + printf/swprintf.c + printf/vfprintf.c + printf/vfwprintf.c + printf/vprintf.c + printf/vsprintf.c + printf/vswprintf.c + printf/vwprintf.c + printf/wprintf.c + printf/wstreamout.c + process/_cwait.c + process/_system.c + process/dll.c + process/process.c + process/procid.c + process/thread.c + process/threadid.c + process/threadx.c + process/wprocess.c + search/bsearch.c + search/lfind.c + search/lsearch.c + signal/signal.c + signal/xcptinfo.c + stdio/_flsbuf.c + stdio/_flswbuf.c + stdio/access.c + stdio/file.c + stdio/find.c + stdio/find64.c + stdio/findi64.c + stdio/fmode.c + stdio/lock_file.c + stdio/perror.c + stdio/popen.c + stdio/stat.c + stdio/stat64.c + stdio/waccess.c + stdio/wfind.c + stdio/wfind64.c + stdio/wfindi64.c + stdio/wpopen.c + stdio/wstat.c + stdio/wstat64.c + stdlib/_exit.c + stdlib/abort.c + stdlib/atexit.c + stdlib/ecvt.c + stdlib/errno.c + stdlib/fcvt.c + stdlib/fcvtbuf.c + stdlib/fullpath.c + stdlib/gcvt.c + stdlib/getenv.c + stdlib/makepath.c + stdlib/makepath_s.c + stdlib/mbtowc.c + stdlib/mbstowcs.c + stdlib/obsol.c + stdlib/putenv.c + stdlib/qsort.c + stdlib/rot.c + stdlib/senv.c + stdlib/swab.c + stdlib/wfulpath.c + stdlib/wputenv.c + stdlib/wsenv.c + stdlib/wmakpath.c + stdlib/wmakpath_s.c + string/atof.c + string/atoi.c + string/atoi64.c + string/atol.c + string/ctype.c + string/itoa.c + string/itow.c + string/lasttok.c + string/scanf.c + string/splitp.c + string/strcoll.c + string/strcspn.c + string/strdup.c + string/strerror.c + string/stricmp.c + string/string.c + string/strlwr.c + string/strncoll.c + string/strnicmp.c + string/strpbrk.c + string/strrev.c + string/strset.c + string/strspn.c + string/strstr.c + string/strtod.c + string/strtoi64.c + string/strtok.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/strupr.c + string/strxfrm.c + string/wcs.c + string/wcstol.c + string/wcstoul.c + string/wsplitp.c + string/wtoi.c + string/wtoi64.c + string/wtol.c + sys_stat/systime.c + time/asctime.c + time/clock.c + time/ctime32.c + time/ctime64.c + time/ctime.c + time/difftime32.c + time/difftime64.c + time/difftime.c + time/ftime32.c + time/ftime64.c + time/ftime.c + time/futime32.c + time/futime64.c + time/futime.c + time/gmtime.c + time/localtime32.c + time/localtime64.c + time/localtime.c + time/mktime.c + time/strdate.c + time/strftime.c + time/strtime.c + time/time32.c + time/time64.c + time/time.c + time/timezone.c + time/tzname.c + time/utime32.c + time/utime64.c + time/utime.c + time/wasctime.c + time/wcsftime.c + time/wctime32.c + time/wctime64.c + time/wctime.c + time/wstrdate.c + time/wstrtime.c + time/wutime32.c + time/wutime64.c + time/wutime.c + wstring/wcscoll.c + wstring/wcscspn.c + wstring/wcsicmp.c + wstring/wcslwr.c + wstring/wcsnicmp.c + wstring/wcsspn.c + wstring/wcsstr.c + wstring/wcstok.c + wstring/wcsupr.c + wstring/wcsxfrm.c + wstring/wlasttok.c + wine/heap.c + wine/undname.c) + +if(ARCH MATCHES i386) + list(APPEND CRT_SOURCE + except/i386/chkstk_asm.s + except/i386/prolog.s + except/i386/seh.s + except/i386/seh_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 + except/amd64/seh.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/ftol2_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) +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) +endif() + +add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE}) + +set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) +add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) +add_dependencies(crt psdk asm)
Propchange: trunk/reactos/lib/sdk/crt/crt.cmake ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake?... ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake (added) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,174 @@ + +list(APPEND LIBCNTPR_SOURCE + float/isnan.c + math/abs.c + math/div.c + math/labs.c + math/rand_nt.c + mbstring/mbstrlen.c + mem/memccpy.c + mem/memcmp.c + mem/memicmp.c + printf/_snprintf.c + printf/_snwprintf.c + printf/_vcprintf.c + printf/_vsnprintf.c + printf/_vsnwprintf.c + printf/sprintf.c + printf/streamout.c + printf/swprintf.c + printf/vprintf.c + printf/vsprintf.c + printf/vswprintf.c + printf/wstreamout.c + search/bsearch.c + search/lfind.c + stdlib/qsort.c + string/ctype.c + string/scanf.c + string/strcspn.c + string/stricmp.c + string/strnicmp.c + string/strlwr.c + string/strrev.c + string/strset.c + string/strstr.c + string/strupr.c + string/strpbrk.c + string/strspn.c + string/atoi64.c + string/atoi.c + string/atol.c + string/itoa.c + string/itow.c + string/mbstowcs_nt.c + string/splitp.c + string/strtol.c + string/strtoul.c + string/strtoull.c + string/wcs.c + string/wcstol.c + string/wcstombs_nt.c + string/wcstoul.c + string/wsplitp.c + string/wtoi64.c + string/wtoi.c + string/wtol.c + wstring/wcsicmp.c + wstring/wcslwr.c + wstring/wcsnicmp.c + wstring/wcsupr.c + wstring/wcscspn.c + wstring/wcsspn.c + wstring/wcsstr.c) + +if(ARCH MATCHES i386) + list(APPEND LIBCNTPR_SOURCE + except/i386/chkstk_asm.s + except/i386/seh.s + except/i386/seh_prolog.s + setjmp/i386/setjmp.s + 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/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/ci.c + misc/i386/readcr4.S) +elseif(ARCH MATCHES amd64) + list(APPEND LIBCNTPR_SOURCE + except/amd64/chkstk_asm.s + except/amd64/seh.s + setjmp/amd64/setjmp.s + 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) +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) +endif() + +add_library(libcntpr ${LIBCNTPR_SOURCE}) +set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) +add_dependencies(libcntpr psdk asm)
Propchange: trunk/reactos/lib/sdk/crt/libcntpr.cmake ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake?... ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake (added) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,47 @@ + +include_directories(include/internal/mingw-w64) + +if(NOT MSVC) + add_definitions(-Wno-main) +endif() + +list(APPEND MSVCRTEX_SOURCE + startup/crtexe.c + startup/wcrtexe.c + startup/_newmode.c + startup/wildcard.c + startup/tlssup.c + startup/mingw_helpers.c + startup/natstart.c + startup/charmax.c + startup/merr.c + startup/atonexit.c + startup/txtmode.c + startup/pseudo-reloc.c + startup/tlsmcrt.c + startup/tlsthrd.c + startup/tlsmthread.c + startup/cinitexe.c + startup/gs_support.c + startup/dll_argv.c + startup/dllargv.c + startup/wdllargv.c + startup/crt0_c.c + startup/crt0_w.c + + misc/fltused.c +) + +if(MSVC) + list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) +else() + list(APPEND MSVCRTEX_SOURCE startup/gccmain.c) +endif() + +add_library(msvcrtex ${MSVCRTEX_SOURCE}) +set_target_properties(msvcrtex PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) + +if(NOT MSVC) + target_link_libraries(msvcrtex oldnames) +endif() +
Propchange: trunk/reactos/lib/sdk/crt/msvcrtex.cmake ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/lib/sdk/crt/oldnames.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/oldnames.cmake?... ============================================================================== --- trunk/reactos/lib/sdk/crt/oldnames.cmake (added) +++ trunk/reactos/lib/sdk/crt/oldnames.cmake [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,10 @@ +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) + + add_custom_target(oldnames ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/liboldnames.a) +endif()
Propchange: trunk/reactos/lib/sdk/crt/oldnames.cmake ------------------------------------------------------------------------------ svn:eol-style = native
Propchange: trunk/reactos/lib/sdk/crt/startup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon May 23 15:50:03 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+)
Propchange: trunk/reactos/lib/sdk/crt/startup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details.
Propchange: trunk/reactos/lib/sdk/crt/startup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: trunk/reactos/lib/sdk/crt/startup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10
Added: trunk/reactos/lib/sdk/crt/startup/wcrtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/wcrtexe... ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/wcrtexe.c (added) +++ trunk/reactos/lib/sdk/crt/startup/wcrtexe.c [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,13 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#define WPRFLAG +#define UNICODE +#define _UNICODE +#define mainCRTStartup wmainCRTStartup +#define WinMainCRTStartup wWinMainCRTStartup + +#include "crtexe.c"
Propchange: trunk/reactos/lib/sdk/crt/startup/wcrtexe.c ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/lib/sdk/crt/startup/wdllargv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/wdllarg... ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/wdllargv.c (added) +++ trunk/reactos/lib/sdk/crt/startup/wdllargv.c [iso-8859-1] Mon May 23 15:50:03 2011 @@ -1,0 +1,3 @@ + +#define WPRFLAG +#include "dllargv.c"
Propchange: trunk/reactos/lib/sdk/crt/startup/wdllargv.c ------------------------------------------------------------------------------ svn:eol-style = native
-
tkreuzer＠svn.reactos.org