Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 50472: [CMAKE] Fix buildno.h when subversion is not installed.
by spetreolle＠svn.reactos.org 23 Jan '11

23 Jan '11

Author: spetreolle Date: Sun Jan 23 11:27:01 2011 New Revision: 50472 URL: http://svn.reactos.org/svn/reactos?rev=50472&view=rev Log: [CMAKE] Fix buildno.h when subversion is not installed. Modified: branches/cmake-bringup/include/reactos/version.cmake Modified: branches/cmake-bringup/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/v… ============================================================================== --- branches/cmake-bringup/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/version.cmake [iso-8859-1] Sun Jan 23 11:27:01 2011 @@ -46,18 +46,19 @@ math(EXPR REACTOS_DLL_VERSION_MAJOR "${KERNEL_VERSION_MAJOR}+42") set(DLL_VERSION_STR "${REACTOS_DLL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}-${KERNEL_VERSION_BUILD_TYPE}") + +# get svn revision number +set(REVISION "-rUNKNOWN") +set(KERNEL_VERSION_BUILD_HEX "0") if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") find_package(Subversion) if(Subversion_FOUND) subversion_wc_info(${CMAKE_CURRENT_SOURCE_DIR} SVNINFO) if(SVNINFO_WC_REVISION) set(REVISION "-r${SVNINFO_WC_REVISION}") - converttohex(${SVNINFO_WC_REVISION} KERNEL_VERSION_BUILD_HEX) + converttohex(${SVNINFO_WC_REVISION} KERNEL_VERSION_BUILD_HEX) endif() endif() -else() - set(REVISION "-rUNKNOWN") - set(HEXREVISION "0x0") endif() configure_file(include/reactos/version.h.cmake ${REACTOS_BINARY_DIR}/include/reactos/version.h)

1 0

[tkreuzer] 50471: [CRT] fix definition of _crt_va_arg for amd64
by tkreuzer＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: tkreuzer Date: Sat Jan 22 23:22:10 2011 New Revision: 50471 URL: http://svn.reactos.org/svn/reactos?rev=50471&view=rev Log: [CRT] fix definition of _crt_va_arg for amd64 Modified: branches/cmake-bringup/include/crt/vadefs.h Modified: branches/cmake-bringup/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/vadef… ============================================================================== --- branches/cmake-bringup/include/crt/vadefs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/vadefs.h [iso-8859-1] Sat Jan 22 23:22:10 2011 @@ -90,9 +90,9 @@ #define _PTRSIZEOF(n) ((sizeof(n) + sizeof(void*) - 1) & ~(sizeof(void*) - 1)) #define _ISSTRUCT(t) ((sizeof(t) > sizeof(void*)) || (sizeof(t) & (sizeof(t)-1)) != 0) #define _crt_va_start(v,l) ((void)((v) = (va_list)_ADDRESSOF(l) + _PTRSIZEOF(l))) -#define _crt_va_arg(v,t) _ISSTRUCT(t) ? \ +#define _crt_va_arg(v,t) (_ISSTRUCT(t) ? \ (**(t**)(((v) += sizeof(void*)) - sizeof(void*))) : \ - (*(t*)(((v) += sizeof(void*)) - sizeof(void*))) + (*(t*)(((v) += sizeof(void*)) - sizeof(void*)))) #define _crt_va_end(v) ((void)((v) = (va_list)0)) #define __va_copy(d,s) ((void)((d) = (s))) #else //if defined(_M_IA64) || defined(_M_CEE)

1 0

[tkreuzer] 50470: - _mingw.h: Don't define USE_MINGW_SETJMP_TWO_ARGS for MSVC - _mingw.h: Fix definition of _CRT_ALIGN for MSVC - intrin.h: _InterlockedAddLargeStatistic is not an intrinsic on MSVC...
by tkreuzer＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: tkreuzer Date: Sat Jan 22 19:17:10 2011 New Revision: 50470 URL: http://svn.reactos.org/svn/reactos?rev=50470&view=rev Log: - _mingw.h: Don't define USE_MINGW_SETJMP_TWO_ARGS for MSVC - _mingw.h: Fix definition of _CRT_ALIGN for MSVC - intrin.h: _InterlockedAddLargeStatistic is not an intrinsic on MSVC for x64 - intrin.h: Fix return type of _InterlockedOr64 - wdm.h: Fix warnings in KfRaiseIrql and RtlExtendedMagicDivide inline implementations - winnt.h: Simplify definition of GetCurrentFiber Modified: branches/cmake-bringup/include/crt/_mingw.h branches/cmake-bringup/include/crt/crtdefs.h branches/cmake-bringup/include/crt/msc/intrin.h branches/cmake-bringup/include/ddk/wdm.h branches/cmake-bringup/include/psdk/winnt.h branches/cmake-bringup/include/xdk/amd64/ke.h branches/cmake-bringup/include/xdk/rtlfuncs.h Modified: branches/cmake-bringup/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/_ming… ============================================================================== --- branches/cmake-bringup/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/_mingw.h [iso-8859-1] Sat Jan 22 19:17:10 2011 @@ -187,7 +187,7 @@ #endif #endif -#ifdef _WIN64 +#if defined(_WIN64) && !defined(_MSC_VER) #undef USE_MINGW_SETJMP_TWO_ARGS #define USE_MINGW_SETJMP_TWO_ARGS #endif Modified: branches/cmake-bringup/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/crtde… ============================================================================== --- branches/cmake-bringup/include/crt/crtdefs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/crtdefs.h [iso-8859-1] Sat Jan 22 19:17:10 2011 @@ -133,7 +133,13 @@ #endif #ifndef _CRT_ALIGN +#if defined (__midl) || defined(__WIDL__) +#define _CRT_ALIGN(x) +#elif defined(_MSC_VER) +#define _CRT_ALIGN(x) __declspec(align(x)) +#else #define _CRT_ALIGN(x) __attribute__ ((aligned(x))) +#endif #endif #ifndef _CRTNOALIAS Modified: branches/cmake-bringup/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/msc/i… ============================================================================== --- branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] Sat Jan 22 19:17:10 2011 @@ -45,8 +45,6 @@ #pragma intrinsic(_InterlockedXor16) long _InterlockedXor(volatile long * const value, const long mask); #pragma intrinsic(_InterlockedXor) -long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); -#pragma intrinsic(_InterlockedAddLargeStatistic) long _InterlockedDecrement(volatile long * const lpAddend); #pragma intrinsic(_InterlockedDecrement) long _InterlockedIncrement(volatile long * const lpAddend); @@ -60,7 +58,10 @@ unsigned char _interlockedbittestandset(volatile long * a, const long b); #pragma intrinsic(_interlockedbittestandset) -#if defined(_M_AMD64) +#if defined(_M_IX86) +long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); +#pragma intrinsic(_InterlockedAddLargeStatistic) +#elif defined(_M_AMD64) __int64 _InterlockedExchange64(volatile __int64 * const Target, const __int64 Value); #pragma intrinsic(_InterlockedExchange64) __int64 _InterlockedExchangeAdd64(volatile __int64 * const Addend, const __int64 Value); @@ -71,7 +72,7 @@ #pragma intrinsic(_InterlockedExchangePointer) __int64 _InterlockedAnd64(volatile __int64 * const value, const __int64 mask); #pragma intrinsic(_InterlockedAnd64) -long _InterlockedOr64(volatile __int64 * const value, const __int64 mask); +__int64 _InterlockedOr64(volatile __int64 * const value, const __int64 mask); #pragma intrinsic(_InterlockedOr64) __int64 _InterlockedCompareExchange64(volatile __int64 * const Destination, const __int64 Exchange, const __int64 Comperand); #pragma intrinsic(_InterlockedCompareExchange64) @@ -133,7 +134,7 @@ #pragma intrinsic(__addgsqword) #endif -//#if defined(_M_IX86) +#if defined(_M_IX86) /*** FS segment addressing ***/ void __writefsbyte(const unsigned long Offset, const unsigned char Data); #pragma intrinsic(__writefsbyte) @@ -159,7 +160,7 @@ #pragma intrinsic(__addfsword) void __addfsdword(const unsigned long Offset, const unsigned int Data); #pragma intrinsic(__addfsdword) -//#endif +#endif /*** Bit manipulation ***/ Modified: branches/cmake-bringup/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ddk/wdm.h… ============================================================================== --- branches/cmake-bringup/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/ddk/wdm.h [iso-8859-1] Sat Jan 22 19:17:10 2011 @@ -7897,7 +7897,7 @@ { KIRQL OldIrql; - OldIrql = __readcr8(); + OldIrql = (KIRQL)__readcr8(); //ASSERT(OldIrql <= NewIrql); __writecr8(NewIrql); return OldIrql; @@ -9309,7 +9309,7 @@ ret64 = UnsignedMultiplyHigh(Pos ? Dividend.QuadPart : -Dividend.QuadPart, MagicDivisor.QuadPart); ret64 >>= ShiftCount; - ret.QuadPart = Pos ? ret64 : -ret64; + ret.QuadPart = Pos ? ret64 : -(LONG64)ret64; return ret; } #endif Modified: branches/cmake-bringup/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/winn… ============================================================================== --- branches/cmake-bringup/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/winnt.h [iso-8859-1] Sat Jan 22 19:17:10 2011 @@ -1361,7 +1361,7 @@ #define SEC_RESERVE 0x04000000 #define SEC_COMMIT 0x08000000 #define SEC_NOCACHE 0x10000000 -#define SEC_WRITECOMBINE 0x40000000 +#define SEC_WRITECOMBINE 0x40000000 #define SEC_LARGE_PAGES 0x80000000 #define SECTION_EXTEND_SIZE 16 #define SECTION_MAP_READ 4 @@ -5097,18 +5097,12 @@ GUID *ObjectType; } OBJECT_TYPE_LIST, *POBJECT_TYPE_LIST; -#if defined(__GNUC__) - #if defined(_M_IX86) -static __inline__ PVOID GetCurrentFiber(void) +FORCEINLINE PVOID GetCurrentFiber(VOID) { - void* ret; - __asm__ __volatile__ ( - "movl %%fs:0x10,%0" - : "=r" (ret) /* allow use of reg eax,ebx,ecx,edx,esi,edi */ - ); - return ret; + return (PVOID)(ULONG_PTR)__readfsdword(0x10); } + #elif defined (_M_AMD64) FORCEINLINE PVOID GetCurrentFiber(VOID) { @@ -5118,10 +5112,11 @@ return (PVOID)__readgsqword(FIELD_OFFSET(NT_TIB, FiberData)); #endif } + #elif defined (_M_ARM) PVOID WINAPI GetCurrentFiber(VOID); -#else -#if defined(_M_PPC) + +#elif defined(_M_PPC) static __inline__ __attribute__((always_inline)) unsigned long __readfsdword_winnt(const unsigned long Offset) { unsigned long result; @@ -5133,42 +5128,15 @@ return result; } -#else -#error Unknown architecture -#endif static __inline__ PVOID GetCurrentFiber(void) { return __readfsdword_winnt(0x10); } -#endif - -#elif defined(__WATCOMC__) - -extern PVOID GetCurrentFiber(void); -#pragma aux GetCurrentFiber = \ - "mov eax, dword ptr fs:0x10" \ - value [eax] \ - modify [eax]; - -#elif defined(_MSC_VER) - -#if (_MSC_FULL_VER >= 13012035) - -__inline PVOID GetCurrentFiber(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); } - #else - -static __inline PVOID GetCurrentFiber(void) -{ - PVOID p; - __asm mov eax, fs:[10h] - __asm mov [p], eax - return p; -} - -#endif /* _MSC_FULL_VER */ - -#endif /* __GNUC__/__WATCOMC__/_MSC_VER */ +#error Unknown architecture +#endif + + #include "inline_ntcurrentteb.h" Modified: branches/cmake-bringup/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/xdk/amd64… ============================================================================== --- branches/cmake-bringup/include/xdk/amd64/ke.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/xdk/amd64/ke.h [iso-8859-1] Sat Jan 22 19:17:10 2011 @@ -67,7 +67,7 @@ { KIRQL OldIrql; - OldIrql = __readcr8(); + OldIrql = (KIRQL)__readcr8(); //ASSERT(OldIrql <= NewIrql); __writecr8(NewIrql); return OldIrql; Modified: branches/cmake-bringup/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/xdk/rtlfu… ============================================================================== --- branches/cmake-bringup/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/xdk/rtlfuncs.h [iso-8859-1] Sat Jan 22 19:17:10 2011 @@ -2630,7 +2630,7 @@ ret64 = UnsignedMultiplyHigh(Pos ? Dividend.QuadPart : -Dividend.QuadPart, MagicDivisor.QuadPart); ret64 >>= ShiftCount; - ret.QuadPart = Pos ? ret64 : -ret64; + ret.QuadPart = Pos ? ret64 : -(LONG64)ret64; return ret; } #endif

1 0

[tkreuzer] 50469: [CMAKE] Remove _M_AXP64 definition
by tkreuzer＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: tkreuzer Date: Sat Jan 22 18:41:33 2011 New Revision: 50469 URL: http://svn.reactos.org/svn/reactos?rev=50469&view=rev Log: [CMAKE] Remove _M_AXP64 definition 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] Sat Jan 22 18:41:33 2011 @@ -124,7 +124,7 @@ if(ARCH MATCHES i386) add_definitions(-D_M_IX86 -D_X86_ -D__i386__) elseif(ARCH MATCHES amd64) - add_definitions(-D_M_AMD64 -D_AMD64_ -D_M_AXP64 -D__x86_64__ -D_WIN64) + add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64) elseif(ARCH MATCHES arm) # _M_ARM is already defined by toolchain add_definitions(-D_ARM_ -D__arm__)

1 0

[ekohl] 50468: [SETUPAPI] Fix a warning.
by ekohl＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: ekohl Date: Sat Jan 22 18:16:12 2011 New Revision: 50468 URL: http://svn.reactos.org/svn/reactos?rev=50468&view=rev Log: [SETUPAPI] Fix a warning. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Sat Jan 22 18:16:12 2011 @@ -2044,7 +2044,7 @@ RpcTryExcept { ret = PNP_GetDeviceList(BindingHandle, - pszFilter, + (LPWSTR)pszFilter, Buffer, &BufferLen, ulFlags);

1 0

[tkreuzer] 50467: [CMAKE] Copy vadefs.h from amd64 branch
by tkreuzer＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: tkreuzer Date: Sat Jan 22 17:52:33 2011 New Revision: 50467 URL: http://svn.reactos.org/svn/reactos?rev=50467&view=rev Log: [CMAKE] Copy vadefs.h from amd64 branch Modified: branches/cmake-bringup/include/crt/vadefs.h Modified: branches/cmake-bringup/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/vadef… ============================================================================== --- branches/cmake-bringup/include/crt/vadefs.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/vadefs.h [iso-8859-1] Sat Jan 22 17:52:33 2011 @@ -81,14 +81,24 @@ #define __va_copy(d,s) __builtin_va_copy(d,s) #elif defined(_MSC_VER) -#if defined(_M_IA64) || defined(_M_AMD64) || defined(_M_CEE) -#error Please implement me -#endif - +#if defined(_M_IX86) #define _crt_va_start(v,l) ((void)((v) = (va_list)_ADDRESSOF(l) + _INTSIZEOF(l))) #define _crt_va_arg(v,l) (*(l *)(((v) += _INTSIZEOF(l)) - _INTSIZEOF(l))) #define _crt_va_end(v) ((void)((v) = (va_list)0)) #define __va_copy(d,s) ((void)((d) = (s))) +#elif defined(_M_AMD64) +#define _PTRSIZEOF(n) ((sizeof(n) + sizeof(void*) - 1) & ~(sizeof(void*) - 1)) +#define _ISSTRUCT(t) ((sizeof(t) > sizeof(void*)) || (sizeof(t) & (sizeof(t)-1)) != 0) +#define _crt_va_start(v,l) ((void)((v) = (va_list)_ADDRESSOF(l) + _PTRSIZEOF(l))) +#define _crt_va_arg(v,t) _ISSTRUCT(t) ? \ + (**(t**)(((v) += sizeof(void*)) - sizeof(void*))) : \ + (*(t*)(((v) += sizeof(void*)) - sizeof(void*))) +#define _crt_va_end(v) ((void)((v) = (va_list)0)) +#define __va_copy(d,s) ((void)((d) = (s))) +#else //if defined(_M_IA64) || defined(_M_CEE) +#error Please implement me +#endif + #endif #if !defined(va_copy) && (!defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L)

1 0

[tkreuzer] 50466: [UNICODE] Fix a warning. (MSC x64)
by tkreuzer＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: tkreuzer Date: Sat Jan 22 17:27:42 2011 New Revision: 50466 URL: http://svn.reactos.org/svn/reactos?rev=50466&view=rev Log: [UNICODE] Fix a warning. (MSC x64) Modified: branches/cmake-bringup/tools/unicode/wine/unicode.h Modified: branches/cmake-bringup/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/win… ============================================================================== --- branches/cmake-bringup/tools/unicode/wine/unicode.h [iso-8859-1] (original) +++ branches/cmake-bringup/tools/unicode/wine/unicode.h [iso-8859-1] Sat Jan 22 17:27:42 2011 @@ -219,7 +219,7 @@ { const WCHAR *s = str; while (*s) s++; - return s - str; + return (unsigned int)(s - str); } WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src );

1 0

[tkreuzer] 50465: [CMAKE] - lowerize ARCH string (fixes cmlib) - move definition
by tkreuzer＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: tkreuzer Date: Sat Jan 22 17:13:06 2011 New Revision: 50465 URL: http://svn.reactos.org/svn/reactos?rev=50465&view=rev Log: [CMAKE] - lowerize ARCH string (fixes cmlib) - move definition 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] Sat Jan 22 17:13:06 2011 @@ -11,6 +11,7 @@ if(NOT ARCH) set(ARCH i386) endif() +string(TOLOWER ${ARCH} ARCH) # Compile options if(ARCH MATCHES i386) @@ -25,10 +26,10 @@ add_definitions(-DTARGET_${ARCH}) - if(ARCH MATCHES i386) - if(MSVC) - add_definitions(-Dinline=__inline) - endif() + if(MSVC) + add_definitions(-Dinline=__inline) + else() + add_definitions(-fshort-wchar) endif() include_directories( @@ -38,10 +39,6 @@ include/reactos include/reactos/wine ${REACTOS_BINARY_DIR}/include) - - if(NOT MSVC) - add_definitions(-fshort-wchar) - endif() add_subdirectory(tools) add_subdirectory(lib)

1 0

[tkreuzer] 50464: [CMAKE] Don't set lib pathes in msc toolchain file. Fixes amd64
by tkreuzer＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: tkreuzer Date: Sat Jan 22 16:26:37 2011 New Revision: 50464 URL: http://svn.reactos.org/svn/reactos?rev=50464&view=rev Log: [CMAKE] Don't set lib pathes in msc toolchain file. Fixes amd64 Modified: branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Sat Jan 22 16:26:37 2011 @@ -1,24 +1,3 @@ - -if(NOT ARCH) - set(ARCH i386) -endif() - -# WDK support -string(REPLACE * ${ARCH} ATL_LIB_PATH $ENV{ATL_LIB_PATH}) -string(REPLACE * ${ARCH} CRT_LIB_PATH $ENV{CRT_LIB_PATH}) -string(REPLACE * ${ARCH} DDK_LIB_PATH $ENV{DDK_LIB_PATH}) -string(REPLACE * ${ARCH} KMDF_LIB_PATH $ENV{KMDF_LIB_PATH}) -string(REPLACE * ${ARCH} MFC_LIB_PATH $ENV{MFC_LIB_PATH}) -string(REPLACE * ${ARCH} SDK_LIB_PATH $ENV{SDK_LIB_PATH}) - -link_directories( -#${ATL_LIB_PATH} - ${CRT_LIB_PATH} - ${DDK_LIB_PATH} -# ${IFSKIT_LIB_PATH} -# ${KMDF_LIB_PATH} -# ${MFC_LIB_PATH} - ${SDK_LIB_PATH}) # the name of the target operating system set(CMAKE_SYSTEM_NAME Windows) @@ -34,7 +13,7 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> /win32 /Dstrict_context_handle= /h <OBJECT> <SOURCE>") -SET(CMAKE_ASM_COMPILE_OBJECT +SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Fo<OBJECT> /c /Ta <OBJECT>.tmp")

1 0

[tkreuzer] 50463: [CMAKE] Fix and improve configure script
by tkreuzer＠svn.reactos.org 22 Jan '11

22 Jan '11

Author: tkreuzer Date: Sat Jan 22 16:25:35 2011 New Revision: 50463 URL: http://svn.reactos.org/svn/reactos?rev=50463&view=rev Log: [CMAKE] Fix and improve configure script Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Sat Jan 22 16:25:35 2011 @@ -7,12 +7,13 @@ if not "%ROS_ARCH%" == "" ( echo Detected RosBE for %ROS_ARCH% set BUILD_ENVIRONMENT=MINGW + set ARCH=%ROS_ARCH% ) if not "%DDK_TARGET_OS%" == "" ( echo Detected DDK/WDK for %_BUILDARCH% - set ROS_ARCH=%_BUILDARCH% + set ARCH=%_BUILDARCH% if "%_BUILDARCH%" == "x86" ( - set ROS_ARCH=i386 + set ARCH=i386 ) set BUILD_ENVIRONMENT=WDK ) @@ -24,12 +25,13 @@ mkdir host-tools ) cd host-tools +del CMakeCache.txt /q set REACTOS_BUILD_TOOLS_DIR=%CD% if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" -DARCH=%ROS_ARCH% %ROS_SOURCE_DIR% + cmake -G "MinGW Makefiles" -DARCH=%ARCH% %ROS_SOURCE_DIR% ) if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DARCH=%_BUILDARCH% %ROS_SOURCE_DIR% + cmake -G "NMake Makefiles" -DARCH=%ARCH% %ROS_SOURCE_DIR% ) cd.. @@ -39,11 +41,12 @@ ) cd reactos +del CMakeCache.txt /q if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ROS_ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% + cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ROS_ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) cd..

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