Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 48265: [MSVCRT] Add exports for ceilf, cosf, logf
by tkreuzer＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: tkreuzer Date: Sun Jul 25 21:58:08 2010 New Revision: 48265 URL: http://svn.reactos.org/svn/reactos?rev=48265&view=rev Log: [MSVCRT] Add exports for ceilf, cosf, logf Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun Jul 25 21:58:08 2010 @@ -1166,10 +1166,12 @@ # @ cdecl btowc(long) @ cdecl calloc(long long) @ cdecl ceil(double) +@ cdecl -arch=x86_64 ceilf(double) @ cdecl clearerr(ptr) # stub clearerr_s @ cdecl clock() @ cdecl cos(double) +@ cdecl -arch=x86_64 cosf(double) @ cdecl cosh(double) @ cdecl ctime(ptr) @ cdecl difftime(long long) @@ -1252,6 +1254,7 @@ @ cdecl localtime(ptr) @ cdecl log(double) @ cdecl log10(double) +@ cdecl -arch=x86_64 logf(double) @ cdecl -i386 longjmp(ptr long) @ cdecl malloc(long) @ cdecl mblen(ptr long)

1 0

[sir_richard] 48264: [CMAKE]: Build more stuff.
by sir_richard＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: sir_richard Date: Sun Jul 25 21:24:00 2010 New Revision: 48264 URL: http://svn.reactos.org/svn/reactos?rev=48264&view=rev Log: [CMAKE]: Build more stuff. Added: branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt (with props) branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt (with props) branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt (with props) branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt (with props) branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt (with props) branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt (with props) branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt (with props) branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/sdk/CMakeLists.txt 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] Sun Jul 25 21:24:00 2010 @@ -1,2 +1,10 @@ add_subdirectory(crt) +add_subdirectory(delayimp) +add_subdirectory(dxguid) +add_subdirectory(ioevent) +add_subdirectory(nt) +add_subdirectory(scrnsave) +add_subdirectory(strmiids) +add_subdirectory(uuid) +add_subdirectory(wdmguid) Added: 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 (added) +++ branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt [iso-8859-1] Sun Jul 25 21:24:00 2010 @@ -1,0 +1,4 @@ + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(delayimp ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/delayimp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/dxguid/CM… ============================================================================== --- branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt [iso-8859-1] Sun Jul 25 21:24:00 2010 @@ -1,0 +1,4 @@ + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(dxguid ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/dxguid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/ioevent/C… ============================================================================== --- branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt [iso-8859-1] Sun Jul 25 21:24:00 2010 @@ -1,0 +1,4 @@ + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(ioevent ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/ioevent/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/nt/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt [iso-8859-1] Sun Jul 25 21:24:00 2010 @@ -1,0 +1,4 @@ + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(nt ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/nt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt [iso-8859-1] Sun Jul 25 21:24:00 2010 @@ -1,0 +1,4 @@ + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(scrnsave ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/scrnsave/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/strmiids/… ============================================================================== --- branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt [iso-8859-1] Sun Jul 25 21:24:00 2010 @@ -1,0 +1,4 @@ + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(strmiids ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/strmiids/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/uuid/CMak… ============================================================================== --- branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt [iso-8859-1] Sun Jul 25 21:24:00 2010 @@ -1,0 +1,4 @@ + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(uuid ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/uuid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/wdmguid/C… ============================================================================== --- branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt [iso-8859-1] Sun Jul 25 21:24:00 2010 @@ -1,0 +1,4 @@ + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(wdmguid ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/wdmguid/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 48263: [TOUCH] Remove ntdll library and link to getopt.
by spetreolle＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: spetreolle Date: Sun Jul 25 20:57:38 2010 New Revision: 48263 URL: http://svn.reactos.org/svn/reactos?rev=48263&view=rev Log: [TOUCH] Remove ntdll library and link to getopt. Modified: trunk/rosapps/applications/cmdutils/touch/touch.rbuild Modified: trunk/rosapps/applications/cmdutils/touch/touch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/touc… ============================================================================== --- trunk/rosapps/applications/cmdutils/touch/touch.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/touch/touch.rbuild [iso-8859-1] Sun Jul 25 20:57:38 2010 @@ -1,6 +1,6 @@ <module name="touch" type="win32cui" installbase="system32" installname="touch.exe"> <include base="touch">.</include> - <library>ntdll</library> + <library>getopt</library> <file>err.c</file> <file>touch.c</file> <file>touch.rc</file>

1 0

[sir_richard] 48262: [CMAKE]: CRT can now be built! Our first cross-compile target. [CMAKE]: Next steps should be to bring all the compiler settings/defines that aren't yet being used, to add per-architecture file tracking, and to enable precompiled header support.
by sir_richard＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: sir_richard Date: Sun Jul 25 20:28:17 2010 New Revision: 48262 URL: http://svn.reactos.org/svn/reactos?rev=48262&view=rev Log: [CMAKE]: CRT can now be built! Our first cross-compile target. [CMAKE]: Next steps should be to bring all the compiler settings/defines that aren't yet being used, to add per-architecture file tracking, and to enable precompiled header support. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt 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] Sun Jul 25 20:28:17 2010 @@ -9,7 +9,8 @@ add_definitions(-D_MT) add_definitions(-D_CRTBLD) - file(GLOB_RECURSE SOURCE "*.c") +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/stdio/findgen.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/string/strtold.c) add_library(crt ${SOURCE})

1 0

[sir_richard] 48261: [CMAKE]: Make cross-build work on all systems. RosBE Already is nice and adds itself to the path. CMAKE is magical and finds the RosBE compilers.
by sir_richard＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: sir_richard Date: Sun Jul 25 20:07:19 2010 New Revision: 48261 URL: http://svn.reactos.org/svn/reactos?rev=48261&view=rev Log: [CMAKE]: Make cross-build work on all systems. RosBE Already is nice and adds itself to the path. CMAKE is magical and finds the RosBE compilers. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sun Jul 25 20:07:19 2010 @@ -6,7 +6,7 @@ SET(CMAKE_CXX_COMPILER mingw32-g++) # here is the target environment located -SET(CMAKE_FIND_ROOT_PATH /usr/local/RosBE ) +#SET(CMAKE_FIND_ROOT_PATH /usr/local/RosBE ) # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search

1 0

[sir_richard] 48260: [CMAKE]: Use some CMAKE magic to have widl defined as a "host tool", and make the cross build CMAKE import it (as native-widl). Cross-build CMAKE will then use "native-widl" to build the header/IDL files in the cross-output-directory, instead of the host-output-directory. [CMAKE]: Add generated headers to the include path.
by sir_richard＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: sir_richard Date: Sun Jul 25 20:04:16 2010 New Revision: 48260 URL: http://svn.reactos.org/svn/reactos?rev=48260&view=rev Log: [CMAKE]: Use some CMAKE magic to have widl defined as a "host tool", and make the cross build CMAKE import it (as native-widl). Cross-build CMAKE will then use "native-widl" to build the header/IDL files in the cross-output-directory, instead of the host-output-directory. [CMAKE]: Add generated headers to the include path. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/include/psdk/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 20:04:16 2010 @@ -15,9 +15,13 @@ include_directories(./include/reactos/wine) add_subdirectory(tools) -add_subdirectory(include/psdk) + +export(TARGETS widl FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() + +set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables") +include(${IMPORT_EXECUTABLES}) add_definitions(-DDBG=1) add_definitions(-D_SEH_ENABLE_TRACE) @@ -35,6 +39,7 @@ include_directories(./include) include_directories(./include/psdk) +include_directories(${REACTOS_BINARY_DIR}/include/psdk) include_directories(./include/crt) include_directories(./include/crt/mingw32) include_directories(./include/ddk) @@ -42,6 +47,8 @@ include_directories(./include/reactos) include_directories(./include/reactos/libs) +add_subdirectory(include/psdk) + add_subdirectory(lib) endif() Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sun Jul 25 20:04:16 2010 @@ -7,8 +7,8 @@ ADD_CUSTOM_COMMAND( OUTPUT ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h - COMMAND widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl - DEPENDS widl + COMMAND native-widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl + DEPENDS native-widl ) SET_SOURCE_FILES_PROPERTIES(

1 0

[sir_richard] 48259: [CMAKE]: Ignore "build" directory. [CMAKE]: Fix build. [CMAKE]: Generate headers outside the source tree, into intermediate directories.
by sir_richard＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: sir_richard Date: Sun Jul 25 19:27:03 2010 New Revision: 48259 URL: http://svn.reactos.org/svn/reactos?rev=48259&view=rev Log: [CMAKE]: Ignore "build" directory. [CMAKE]: Fix build. [CMAKE]: Generate headers outside the source tree, into intermediate directories. Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/include/psdk/CMakeLists.txt branches/cmake-bringup/tools/buildno/CMakeLists.txt branches/cmake-bringup/tools/unicode/CMakeLists.txt Propchange: branches/cmake-bringup/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jul 25 19:27:03 2010 @@ -5,6 +5,7 @@ obj-* output-* reactos +build reactos.* RosBE-Logs *.sln 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 19:27:03 2010 @@ -11,6 +11,7 @@ include_directories(${REACTOS_SOURCE_DIR}/tools/unicode) include_directories(./include) +include_directories(./include/reactos) include_directories(./include/reactos/wine) add_subdirectory(tools) Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sun Jul 25 19:27:03 2010 @@ -6,18 +6,18 @@ GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE) ADD_CUSTOM_COMMAND( - OUTPUT ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h - COMMAND widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl + OUTPUT ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h + COMMAND widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl DEPENDS widl ) SET_SOURCE_FILES_PROPERTIES( - ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h + ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h PROPERTIES GENERATED TRUE ) - ADD_CUSTOM_TARGET(build_${FILE}_idl ALL DEPENDS ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h) + ADD_CUSTOM_TARGET(build_${FILE}_idl ALL DEPENDS ${REACTOS_BINARY_DIR}/include/psdk/${FILE}.h) ENDFOREACH(_in_FILE ${ARGN}) Modified: branches/cmake-bringup/tools/buildno/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/buildno/CMa… ============================================================================== --- branches/cmake-bringup/tools/buildno/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/buildno/CMakeLists.txt [iso-8859-1] Sun Jul 25 19:27:03 2010 @@ -4,8 +4,8 @@ target_link_libraries(buildno xml) -ADD_CUSTOM_COMMAND(OUTPUT ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h +ADD_CUSTOM_COMMAND(OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h COMMAND buildno ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h ) -ADD_CUSTOM_TARGET(build_header ALL DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/buildno.h) +ADD_CUSTOM_TARGET(build_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) Modified: branches/cmake-bringup/tools/unicode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/CMa… ============================================================================== --- branches/cmake-bringup/tools/unicode/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/unicode/CMakeLists.txt [iso-8859-1] Sun Jul 25 19:27:03 2010 @@ -1,8 +1,8 @@ file(GLOB_RECURSE SOURCE "*.c") -LIST(REMOVE_ITEM SOURCE "fold.c") -LIST(REMOVE_ITEM SOURCE "sortkey.c") +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/fold.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/sortkey.c) add_definitions(-DWINE_UNICODE_API= )

1 0

[sir_richard] 48258: [CMAKE]: Start supporting building the CRT.
by sir_richard＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: sir_richard Date: Sun Jul 25 19:18:15 2010 New Revision: 48258 URL: http://svn.reactos.org/svn/reactos?rev=48258&view=rev Log: [CMAKE]: Start supporting building the CRT. Added: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt (with props) Modified: branches/cmake-bringup/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 19:18:15 2010 @@ -1,31 +1,45 @@ cmake_minimum_required(VERSION 2.8) project(REACTOS) -include_directories(${REACTOS_SOURCE_DIR}/tools/unicode) - -include_directories(./include) - -include_directories(./include/reactos) -include_directories(./include/reactos/wine) - -add_definitions(-DTARGET_i386) add_definitions(-D__REACTOS__) #-fshort-wchar if(NOT CMAKE_CROSSCOMPILING) +add_definitions(-DTARGET_i386) + +include_directories(${REACTOS_SOURCE_DIR}/tools/unicode) +include_directories(./include) +include_directories(./include/reactos/wine) + add_subdirectory(tools) +add_subdirectory(include/psdk) else() +add_definitions(-DDBG=1) +add_definitions(-D_SEH_ENABLE_TRACE) +add_definitions(-DKDBG=1) +add_definitions(-DWINVER=0x502) +add_definitions(-D_WIN32_IE=0x600) +add_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINDOWS=0x502) +add_definitions(-D_SETUPAPI_VER=0x502) +add_definitions(-D_M_IX86) +add_definitions(-D_X86_) +add_definitions(-D__i386__) +add_definitions(-DUSE_COMPILER_EXCEPTIONS) +add_definitions(-D_USE_32BIT_TIME_T) + include_directories(./include) +include_directories(./include/psdk) +include_directories(./include/crt) include_directories(./include/crt/mingw32) -include_directories(./include/crt) +include_directories(./include/ddk) +include_directories(./include/ndk) +include_directories(./include/reactos) include_directories(./include/reactos/libs) -include_directories(./include/ndk) -include_directories(./include/psdk) -include_directories(./include/ddk) add_subdirectory(lib) Added: 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 (added) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Jul 25 19:18:15 2010 @@ -1,0 +1,15 @@ + +include_directories(.) +include_directories(./include) + +add_definitions(-D__MINGW_IMPORT=extern) +add_definitions(-DUSE_MSVCRT_PREFIX) +add_definitions(-D_MSVCRT_LIB_) +add_definitions(-D_MSVCRT_) +add_definitions(-D_MT) +add_definitions(-D_CRTBLD) + + +file(GLOB_RECURSE SOURCE "*.c") + +add_library(crt ${SOURCE}) Propchange: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48257: [CMAKE] - Properly remove the items from the list.
by akhaldi＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: akhaldi Date: Sun Jul 25 19:01:01 2010 New Revision: 48257 URL: http://svn.reactos.org/svn/reactos?rev=48257&view=rev Log: [CMAKE] - Properly remove the items from the list. Modified: branches/cmake-bringup/tools/unicode/CMakeLists.txt Modified: branches/cmake-bringup/tools/unicode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/CMa… ============================================================================== --- branches/cmake-bringup/tools/unicode/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/unicode/CMakeLists.txt [iso-8859-1] Sun Jul 25 19:01:01 2010 @@ -1,7 +1,8 @@ file(GLOB_RECURSE SOURCE "*.c") -string(REGEX REPLACE "fold.c" "" SOURCE "${SOURCE}") -string(REGEX REPLACE "sortkey.c" "" SOURCE "${SOURCE}") + +LIST(REMOVE_ITEM SOURCE "fold.c") +LIST(REMOVE_ITEM SOURCE "sortkey.c") add_definitions(-DWINE_UNICODE_API= )

1 0

[sir_richard] 48256: [CMAKE]: Add a makefile to build the IDL files. Not perfect, but gets the job done. [CMAKE]: Add a mignw32 toolchain file, right now it's pretty hacked for my system only, but it works.
by sir_richard＠svn.reactos.org 25 Jul '10

25 Jul '10

Author: sir_richard Date: Sun Jul 25 17:03:07 2010 New Revision: 48256 URL: http://svn.reactos.org/svn/reactos?rev=48256&view=rev Log: [CMAKE]: Add a makefile to build the IDL files. Not perfect, but gets the job done. [CMAKE]: Add a mignw32 toolchain file, right now it's pretty hacked for my system only, but it works. Added: branches/cmake-bringup/include/psdk/CMakeLists.txt (with props) branches/cmake-bringup/toolchain-mingw32.cmake (with props) Added: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt (added) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Sun Jul 25 17:03:07 2010 @@ -1,0 +1,51 @@ + +MACRO (MACRO_ADD_INTERFACES) + + FOREACH(_in_FILE ${ARGN}) + + GET_FILENAME_COMPONENT(FILE ${_in_FILE} NAME_WE) + + ADD_CUSTOM_COMMAND( + OUTPUT ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h + COMMAND widl -I${REACTOS_SOURCE_DIR}/include/dxsdk -I. -I${REACTOS_SOURCE_DIR}/include -I${REACTOS_SOURCE_DIR}/include/psdk -m32 --win32 -h -H ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.idl + DEPENDS widl + ) + + SET_SOURCE_FILES_PROPERTIES( + ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h + PROPERTIES + GENERATED TRUE + ) + + ADD_CUSTOM_TARGET(build_${FILE}_idl ALL DEPENDS ${REACTOS_SOURCE_DIR}/include/psdk/${FILE}.h) + + ENDFOREACH(_in_FILE ${ARGN}) + +ENDMACRO (MACRO_ADD_INTERFACES) + +file(GLOB_RECURSE SOURCE "*.idl") +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/access.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/asynot.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/asysta.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/binres.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/cmdbas.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/cmdtxt.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/crtrow.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbccmd.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbcses.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbdsad.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbinit.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/vmrender.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/sesprp.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/rstloc.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/rstbas.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/rstinf.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/rowchg.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/row.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/opnrst.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dyngraph.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbs.idl) +LIST(REMOVE_ITEM SOURCE ${REACTOS_SOURCE_DIR}/include/psdk/dbprop.idl) + +MACRO_ADD_INTERFACES(${SOURCE}) + Propchange: branches/cmake-bringup/include/psdk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake (added) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sun Jul 25 17:03:07 2010 @@ -1,0 +1,16 @@ +# the name of the target operating system +SET(CMAKE_SYSTEM_NAME Windows) + +# which compilers to use for C and C++ +SET(CMAKE_C_COMPILER mingw32-gcc) +SET(CMAKE_CXX_COMPILER mingw32-g++) + +# here is the target environment located +SET(CMAKE_FIND_ROOT_PATH /usr/local/RosBE ) + +# adjust the default behaviour of the FIND_XXX() commands: +# search headers and libraries in the target environment, search +# programs in the host environment +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) Propchange: branches/cmake-bringup/toolchain-mingw32.cmake ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs