Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48318: [FREELDR] - Move all 16 bit code to .text16 section - Fix linking issues with x86_16_SwitchToLong, by using a relative call - Align pagetables by page size - Add mainCRTStartup entry point freeldr now starts again

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 27 21:49:19 2010 New Revision: 48318 URL: http://svn.reactos.org/svn/reactos?rev=48318&view=rev Log: [FREELDR] - Move all 16 bit code to .text16 section - Fix linking issues with x86_16_SwitchToLong, by using a relative call - Align pagetables by page size - Add mainCRTStartup entry point freeldr now starts again Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/arch.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -1,11 +1,10 @@ .intel_syntax noprefix -.text -.code16 #define ASM #include <arch.h> -//.org 0x8000 +.code16 +.section .text16, "x" .global RealEntryPoint RealEntryPoint: @@ -284,6 +283,7 @@ jmp LMODE_CS:offset LongCat //Load CS with 64 bit segment and flush the instruction cache .code64 +.text LongCat: /* Set up 64 bit stack */ mov rsp, stack64 @@ -378,6 +378,7 @@ /** Some data *****************************************************************/ +.text .code64 stack16: @@ -449,6 +450,6 @@ /* Need to include them here, because of linking issues between 64 / 16 bit */ //#include "debug16.S" #include "int386.S" -#include "boot.S" +//#include "boot.S" #include "i386pnp.S" Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -4,9 +4,8 @@ .intel_syntax noprefix -.text - .code16 +.section .text16, "x" #define BootSectorStackTop 0x7bf2 #define DataAreaStartHigh 0x2 @@ -48,13 +47,14 @@ // encode a jmp instruction to jump to 0000:8200 //.org 0x8000 -.global _mainCRTStartup // For Mingw32 builds where the linker looks for this symbol -_mainCRTStartup: +.global mainCRTStartup // For Mingw32 builds where the linker looks for this symbol +mainCRTStartup: .global start start: - .byte 0xe9 - .byte 0xfd - .byte 0x01 + jmp RealEntryPoint +// .byte 0xe9 +// .byte 0xfd +// .byte 0x01 // Now starts the extra boot code that we will store // in the first 512 bytes of freeldr.sys. This code @@ -67,7 +67,7 @@ push ax // First save AX - the start cluster of freeldr.sys - +#if 0 // Display "Loading FreeLoader..." message mov esi, offset msgLoading // Loading message call [bp-PutCharsOffset] // Display it @@ -117,15 +117,17 @@ pop es jmp LoadFile // Load the next cluster (if any) - +#endif LoadFile_Done: mov dl, [bp+BootDrive] // Load the boot drive into DL mov dh, BootPartition // Load the boot partition into DH - push word ptr 0x0000 - push word ptr 0x8000 // We will do a far return to 0000:8000h - -// retf // Transfer control to ROSLDR - .byte 0xcb // == retf + + push 0 // push segment (0x0000) + mov bx, [0x8000 + 0xA8] // load the RVA of the EntryPoint into eax + add bx, 0x8000 // RVA -> VA and skip 3 bytes (jump to fathelper code) + push bx // push offset +// retf // Transfer control to FreeLoader + .byte 0xcb // == retf // Reads the entire FAT into memory at 7000:0000 @@ -224,7 +226,8 @@ ret - +.text +.code64 msgLoading: .ascii "Loading FreeLoader..." .byte 0x0d,0x0a,0 Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -17,13 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - .text - .code16 - #define ASM - #include <arch.h> +.code64 +.text /* * U32 PnpBiosSupported(VOID); @@ -144,7 +142,7 @@ movzx ecx, ax mov _pnp_result, ecx - call x86_16_SwitchToLong + call [x86_16_SwitchToLong_ptr] .code64 mov esi, [rbp + 0x08] @@ -236,7 +234,7 @@ movzx ecx, ax mov _pnp_result, ecx - call x86_16_SwitchToLong + call [x86_16_SwitchToLong_ptr] .code64 /* update node number */ @@ -255,4 +253,7 @@ ret +x86_16_SwitchToLong_ptr: + .quad x86_16_SwitchToLong + /* EOF */ Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/int386.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -17,13 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - .intel_syntax noprefix - .text - .code16 +.intel_syntax noprefix #define ASM #include <arch.h> +.code64 +.text Int386_REGS: @@ -59,6 +59,10 @@ .quad 0 Int386_regsout: .quad 0 + + +.code16 +.section .text16, "x" /* * int Int386(int ivec, REGS* in, REGS* out); Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/mb.S [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -49,7 +49,8 @@ .byte 0 .endr -.bss +.text +.align 4096 PageDirectoryStart: pml4_startup: .fill 4096, 1, 0 Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -17,7 +17,7 @@ </if> <ifnot property="ARCH" value="powerpc"> - <module name="freeldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)"> + <module name="freeldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)" entrypoint="mainCRTStartup"> <linkerscript>freeldr_$(ARCH).lnk</linkerscript> <bootstrap installbase="loader" /> <library>freeldr_startup</library> Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/freeldr_amd64.lnk [iso-8859-1] Tue Jul 27 21:49:19 2010 @@ -2,7 +2,13 @@ ENTRY(_mainCRTStartup) SECTIONS { - .text __image_base__ + __section_alignment__ : + .text16 __image_base__ + __section_alignment__ : + { + __text16_start__ = . ; + *(.text16) + __text16_end__ = . ; + } + .text BLOCK(__section_alignment__) : { __text_start__ = .; *(.init) @@ -19,12 +25,6 @@ *(.gcc_exc) __text_end__ = .; *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; } .data BLOCK(__section_alignment__) : { @@ -44,14 +44,6 @@ *(SORT(.rdata$*)) *(.eh_frame) } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } }

14 years, 5 months

[tkreuzer] 48317: [RTL] Revert accidental changes to sprintf in r47468

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 27 21:43:26 2010 New Revision: 48317 URL: http://svn.reactos.org/svn/reactos?rev=48317&view=rev Log: [RTL] Revert accidental changes to sprintf in r47468 Modified: branches/ros-amd64-bringup/reactos/lib/rtl/sprintf.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/sprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/sprintf.c [iso-8859-1] Tue Jul 27 21:43:26 2010 @@ -27,40 +27,33 @@ #define SPECIAL 32 /* 0x */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ #define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; +typedef union { + struct { + unsigned int mantissal:32; + unsigned int mantissah:20; + unsigned int exponent:11; + unsigned int sign:1; + }; + long long AsLongLong; } double_t; + +/* We depend on this being true */ +C_ASSERT(sizeof(double_t) == sizeof(double)); static __inline int -_isinf(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); +_isinf(double_t x) +{ + return ( x.exponent == 0x7ff && ( x.mantissah == 0 && x.mantissal == 0 )); } static __inline int -_isnan(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); +_isnan(double_t x) +{ + return ( x.exponent == 0x7ff && ( x.mantissah != 0 || x.mantissal != 0 )); } @@ -180,14 +173,13 @@ } static char * -numberf(char * buf, char * end, double num, int base, int size, int precision, int type) +numberf(char * buf, char * end, double_t num, int base, int size, int precision, int type) { char c,sign,tmp[66]; const char *digits; const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; int i; - long long x; /* FIXME the float version of number is direcly copy of number @@ -201,9 +193,9 @@ c = (type & ZEROPAD) ? '0' : ' '; sign = 0; if (type & SIGN) { - if (num < 0) { + if (num.sign) { sign = '-'; - num = -num; + num.sign = 0; size--; } else if (type & PLUS) { sign = '+'; @@ -220,15 +212,11 @@ size--; } i = 0; - if (num == 0) + if (num.AsLongLong == 0) tmp[i++] = '0'; - else while (num != 0) + else while (num.AsLongLong != 0) { - x = num; - tmp[i++] = digits[do_div(&x,base)]; -#ifndef _M_ARM // Missing __floatdidf in CeGCC 0.55 -- GCC 4.4 - num=x; -#endif + tmp[i++] = digits[do_div(&num.AsLongLong,base)]; } if (i > precision) precision = i; @@ -389,7 +377,7 @@ { int len; unsigned long long num; - double _double; + double_t _double; int base; char *str, *end; @@ -603,7 +591,7 @@ case 'f': case 'g': case 'G': - _double = (double)va_arg(args, double); + _double = va_arg(args, double_t); if ( _isnan(_double) ) { s = "Nan"; len = 3; @@ -634,7 +622,7 @@ } else { if ( precision == -1 ) precision = 6; - str = numberf(str, end, (int)_double, base, field_width, precision, flags); + str = numberf(str, end, _double, base, field_width, precision, flags); } continue;

14 years, 5 months

[sir_richard] 48316: [CMAKE]: Fix compiler detection, we should check for CMAKE_HOST_SYSTEM_NAME, not CMAKE_SYSTEM_NAME, which is always Windows on a cross-build. [CMAKE]: PROCESSIR->PROCESSOR

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jul 27 17:36:25 2010 New Revision: 48316 URL: http://svn.reactos.org/svn/reactos?rev=48316&view=rev Log: [CMAKE]: Fix compiler detection, we should check for CMAKE_HOST_SYSTEM_NAME, not CMAKE_SYSTEM_NAME, which is always Windows on a cross-build. [CMAKE]: PROCESSIR->PROCESSOR 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] Tue Jul 27 17:36:25 2010 @@ -1,5 +1,5 @@ # Choose the right MinGW prefix -if (CMAKE_SYSTEM_NAME STREQUAL Windows) +if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(MINGW_PREFIX "") else() set(MINGW_PREFIX "mingw32-") @@ -7,7 +7,7 @@ # the name of the target operating system SET(CMAKE_SYSTEM_NAME Windows) -SET(CMAKE_SYSTEM_PROCESSIR i686) +SET(CMAKE_SYSTEM_PROCESSOR i686) # which compilers to use for C and C++ SET(CMAKE_C_COMPILER ${MINGW_PREFIX}gcc)

14 years, 5 months

[tkreuzer] 48315: [DBGHELP] Define UNW_FLAG_* in the rbuild file, since we don't have them in winnt.h where wine has them.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 27 17:02:06 2010 New Revision: 48315 URL: http://svn.reactos.org/svn/reactos?rev=48315&view=rev Log: [DBGHELP] Define UNW_FLAG_* in the rbuild file, since we don't have them in winnt.h where wine has them. Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] Tue Jul 27 17:02:06 2010 @@ -9,6 +9,12 @@ <define name="_WINE" /> <define name="HAVE_REGEX_H" /> <define name="_IMAGEHLP_SOURCE_" /> + <if property="ARCH" value="amd64"> + <define name="UNW_FLAG_NHANDLER">0</define> + <define name="UNW_FLAG_EHANDLER">1</define> + <define name="UNW_FLAG_UHANDLER">2</define> + <define name="UNW_FLAG_CHAININFO">3</define> + </if> <file>coff.c</file> <file>cpu_i386.c</file> <file>cpu_ppc.c</file>

14 years, 5 months

[tkreuzer] 48314: [GDI32API] - fix some 64 bit warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 27 16:24:31 2010 New Revision: 48314 URL: http://svn.reactos.org/svn/reactos?rev=48314&view=rev Log: [GDI32API] - fix some 64 bit warnings Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c trunk/rostests/apitests/gdi32api/tests/GetStockObject.c Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c [iso-8859-1] Tue Jul 27 16:24:31 2010 @@ -78,7 +78,7 @@ RTEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BITMAP, sizeof(BITMAP), NULL) == sizeof(BITMAP)); RTEST(GetObjectA(hBitmap, sizeof(DIBSECTION), NULL) == sizeof(BITMAP)); RTEST(GetObjectA(hBitmap, 0, NULL) == sizeof(BITMAP)); - RTEST(GetObjectA((HANDLE)((UINT)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP)); + RTEST(GetObjectA((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP)); RTEST(GetObjectA(hBitmap, 5, NULL) == sizeof(BITMAP)); RTEST(GetObjectA(hBitmap, -5, NULL) == sizeof(BITMAP)); RTEST(GetObjectA(hBitmap, 0, Buffer) == 0); @@ -416,7 +416,7 @@ hMetaDC = CreateMetaFile(NULL); if(!hMetaDC) return FALSE; - if(((UINT)hMetaDC & GDI_HANDLE_TYPE_MASK) != GDI_OBJECT_TYPE_METADC) return FALSE; + if(((UINT_PTR)hMetaDC & GDI_HANDLE_TYPE_MASK) != GDI_OBJECT_TYPE_METADC) return FALSE; SetLastError(ERROR_SUCCESS); RTEST(GetObjectA((HANDLE)GDI_OBJECT_TYPE_METADC, 0, NULL) == 0); Modified: trunk/rostests/apitests/gdi32api/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetStockObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/GetStockObject.c [iso-8859-1] Tue Jul 27 16:24:31 2010 @@ -12,7 +12,7 @@ RTEST(GetLastError() == ERROR_SUCCESS); /* Test for the stock bit */ - RTEST((UINT)GetStockObject(WHITE_BRUSH) && GDI_HANDLE_STOCK_MASK); + RTEST((UINT_PTR)GetStockObject(WHITE_BRUSH) && GDI_HANDLE_STOCK_MASK); /* Test for correct types */ RTEST(GDI_HANDLE_GET_TYPE(GetStockObject(WHITE_BRUSH)) == GDI_OBJECT_TYPE_BRUSH); /* 0 */

14 years, 5 months

[tkreuzer] 48313: [FREELDR] Don't redefine _NTSYSTEM_

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 27 16:21:20 2010 New Revision: 48313 URL: http://svn.reactos.org/svn/reactos?rev=48313&view=rev Log: [FREELDR] Don't redefine _NTSYSTEM_ Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Tue Jul 27 16:21:20 2010 @@ -16,7 +16,6 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _NTSYSTEM_ #include <freeldr.h> #define NDEBUG

14 years, 5 months

[tkreuzer] 48312: [BATTC] Fix a warning

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 27 16:09:15 2010 New Revision: 48312 URL: http://svn.reactos.org/svn/reactos?rev=48312&view=rev Log: [BATTC] Fix a warning Modified: trunk/reactos/drivers/battery/battc/battc.c Modified: trunk/reactos/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… ============================================================================== --- trunk/reactos/drivers/battery/battc/battc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/battery/battc/battc.c [iso-8859-1] Tue Jul 27 16:09:15 2010 @@ -186,6 +186,7 @@ LARGE_INTEGER Timeout; PBATTERY_STATUS BattStatus; BATTERY_NOTIFY BattNotify; + ULONG ReturnedLength; Irp->IoStatus.Information = 0; @@ -322,7 +323,8 @@ BattQueryInfo->AtRate, Irp->AssociatedIrp.SystemBuffer, IrpSp->Parameters.DeviceIoControl.OutputBufferLength, - &Irp->IoStatus.Information); + &ReturnedLength); + Irp->IoStatus.Information = ReturnedLength; if (!NT_SUCCESS(Status)) DPRINT1("QueryInformation failed (0x%x)\n", Status); break;

14 years, 5 months

[sir_richard] 48311: [CMAKE]: Watch and learn, Amine...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jul 27 16:07:39 2010 New Revision: 48311 URL: http://svn.reactos.org/svn/reactos?rev=48311&view=rev Log: [CMAKE]: Watch and learn, Amine... Modified: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt Modified: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/idna/CMak… ============================================================================== --- branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] Tue Jul 27 16:07:39 2010 @@ -1,7 +1,12 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") +# Special C++ flags +add_definitions(-fno-exceptions -fno-rtti) + +# Re-definition of WINVER +remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line +add_definitions(-DWINVER=0x600) # And now we add our own file(GLOB_RECURSE SOURCE "*.cpp") Modified: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/normalize… ============================================================================== --- branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] Tue Jul 27 16:07:39 2010 @@ -1,7 +1,12 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") +# Special C++ flags +add_definitions(-fno-exceptions -fno-rtti) + +# Re-definition of WINVER +remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line +add_definitions(-DWINVER=0x600) # And now we add our own file(GLOB_RECURSE SOURCE "*.cpp") Modified: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/scripts/C… ============================================================================== --- branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] Tue Jul 27 16:07:39 2010 @@ -1,7 +1,12 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") +# Special C++ flags +add_definitions(-fno-exceptions -fno-rtti) + +# Re-definition of WINVER +remove_definitions(-DWINVER=0x502) # This removes a top-level definition: The compiler never gets it on the command-line +add_definitions(-DWINVER=0x600) # And now we add our own file(GLOB_RECURSE SOURCE "*.cpp")

14 years, 5 months

[sir_richard] 48310: [CMAKE]: Too much of bzip2 was being built.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jul 27 16:03:05 2010 New Revision: 48310 URL: http://svn.reactos.org/svn/reactos?rev=48310&view=rev Log: [CMAKE]: Too much of bzip2 was being built. Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/bzip… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] Tue Jul 27 16:03:05 2010 @@ -1,6 +1,6 @@ add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) file(GLOB_RECURSE SOURCE "*.c") -LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/bzip2.c ${CMAKE_CURRENT_SOURCE_DIR}/dlltest.c ${CMAKE_CURRENT_SOURCE_DIR}/spewG.c ${CMAKE_CURRENT_SOURCE_DIR}/unzcrash.c) +LIST(REMOVE_ITEM SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/compress.c ${CMAKE_CURRENT_SOURCE_DIR}/randtable.c ${CMAKE_CURRENT_SOURCE_DIR}/bzip2recover.c ${CMAKE_CURRENT_SOURCE_DIR}/blocksort.c ${CMAKE_CURRENT_SOURCE_DIR}/bzip2.c ${CMAKE_CURRENT_SOURCE_DIR}/dlltest.c ${CMAKE_CURRENT_SOURCE_DIR}/spewG.c ${CMAKE_CURRENT_SOURCE_DIR}/unzcrash.c) add_library(bzip2 ${SOURCE})

14 years, 5 months

[sir_richard] 48309: [CMAKE]: Detect correct MinGW compiler on Windows vs Linux/Darwin.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Jul 27 16:00:40 2010 New Revision: 48309 URL: http://svn.reactos.org/svn/reactos?rev=48309&view=rev Log: [CMAKE]: Detect correct MinGW compiler on Windows vs Linux/Darwin. 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] Tue Jul 27 16:00:40 2010 @@ -1,12 +1,17 @@ +# Choose the right MinGW prefix +if (CMAKE_SYSTEM_NAME STREQUAL Windows) +set(MINGW_PREFIX "") +else() +set(MINGW_PREFIX "mingw32-") +endif() + # the name of the target operating system SET(CMAKE_SYSTEM_NAME Windows) +SET(CMAKE_SYSTEM_PROCESSIR i686) # 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 ) +SET(CMAKE_C_COMPILER ${MINGW_PREFIX}gcc) +SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}g++) # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search

14 years, 5 months

← Newer
1
...
5
6
7
8
9
10
11
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010