- Improve bootvid, crt and ntoskrnl.

svn path=/branches/cmake-bringup/; revision=48762
This commit is contained in:
Amine Khaldi 2010-09-12 21:02:18 +00:00
parent d95f9d3190
commit 6e7a324a26
3 changed files with 31 additions and 15 deletions

View file

@ -3,14 +3,18 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FL
spec2def(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/bootvid.spec ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) spec2def(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/bootvid.spec ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def)
list(APPEND SOURCE list(APPEND SOURCE bootvid.rc)
${ARCH}/bootvid.c
${ARCH}/bootdata.c
bootvid.rc)
if(ARCH MATCHES i386) if(ARCH MATCHES i386 OR ARCH MATCHES amd64)
list(APPEND SOURCE i386/vga.c) list(APPEND SOURCE
endif(ARCH MATCHES i386) i386/bootvid.c
i386/bootdata.c
i386/vga.c)
elseif(ARCH MATCHES arm)
list(APPEND SOURCE
arm/bootvid.c
arm/bootdata.c)
endif(ARCH MATCHES i386 OR ARCH MATCHES amd64)
add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid_precomp.h.gch ${SOURCE}) add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid_precomp.h.gch ${SOURCE})

View file

@ -40,11 +40,6 @@ list(APPEND CRT_SOURCE
float/isnan.c float/isnan.c
float/nafter.c float/nafter.c
float/scalb.c float/scalb.c
float/${ARCH}/clearfp.c
float/${ARCH}/cntrlfp.c
float/${ARCH}/fpreset.c
float/${ARCH}/logb.c
float/${ARCH}/statfp.c
locale/locale.c locale/locale.c
math/acos.c math/acos.c
math/adjust.c math/adjust.c
@ -287,9 +282,23 @@ list(APPEND CRT_SOURCE
wine/undname.c) wine/undname.c)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
list(APPEND CRT_SOURCE except/i386/prolog.s except/i386/unwind.c) list(APPEND CRT_SOURCE
except/i386/chkstk_asm.s
except/i386/prolog.s
except/i386/unwind.c
float/i386/clearfp.c
float/i386/cntrlfp.c
float/i386/fpreset.c
float/i386/logb.c
float/i386/statfp.c)
elseif(ARCH MATCHES amd64) elseif(ARCH MATCHES amd64)
list(APPEND CRT_SOURCE chkstk_asm.s) list(APPEND CRT_SOURCE
except/amd64/chkstk_asm.s
float/i386/clearfp.c
float/i386/cntrlfp.c
float/i386/fpreset.c
float/i386/logb.c
float/i386/statfp.c)
endif(ARCH MATCHES i386) endif(ARCH MATCHES i386)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)

View file

@ -23,7 +23,6 @@ list(APPEND SOURCE
cc/mdl.c cc/mdl.c
cc/pin.c cc/pin.c
cc/view.c cc/view.c
config/${ARCH}/cmhardwr.c
config/cmalloc.c config/cmalloc.c
config/cmapi.c config/cmapi.c
config/cmboot.c config/cmboot.c
@ -251,6 +250,7 @@ list(APPEND SOURCE
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
list(APPEND SOURCE list(APPEND SOURCE
config/i386/cmhardwr.c
ex/i386/interlck_asm.S ex/i386/interlck_asm.S
ex/i386/fastinterlck_asm.S ex/i386/fastinterlck_asm.S
ex/i386/ioport.S ex/i386/ioport.S
@ -280,6 +280,7 @@ list(APPEND SOURCE
vdm/vdmexec.c) vdm/vdmexec.c)
elseif(ARCH MATCHES amd64) elseif(ARCH MATCHES amd64)
list(APPEND SOURCE list(APPEND SOURCE
config/i386/cmhardwr.c
ex/amd64/fastinterlck.c ex/amd64/fastinterlck.c
ke/amd64/boot.S ke/amd64/boot.S
ke/amd64/context.c ke/amd64/context.c
@ -298,6 +299,7 @@ list(APPEND SOURCE
ps/amd64/psctx.c) ps/amd64/psctx.c)
elseif(ARCH MATCHES arm) elseif(ARCH MATCHES arm)
list(APPEND SOURCE list(APPEND SOURCE
config/arm/cmhardwr.c
ke/arm/boot.s ke/arm/boot.s
ke/arm/cpu.c ke/arm/cpu.c
ke/arm/ctxswtch.s ke/arm/ctxswtch.s
@ -314,6 +316,7 @@ list(APPEND SOURCE
rtl/arm/rtlexcpt.c) rtl/arm/rtlexcpt.c)
elseif(ARCH MATCHES powerpc) elseif(ARCH MATCHES powerpc)
list(APPEND SOURCE list(APPEND SOURCE
config/powerpc/cmhardwr.c
ke/powerpc/main_asm.S ke/powerpc/main_asm.S
ke/powerpc/cpu.c ke/powerpc/cpu.c
ke/powerpc/exp.c ke/powerpc/exp.c