Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix the CFLAGS handling to avoid duplicating flags on command line.

Browse source 
svn path=/trunk/; revision=11304
This commit is contained in:
Filip Navara 2004-10-17 02:51:39 +00:00
parent 33a12b714a
commit 1f59f1138b
1 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
reactos/ntoskrnl/Makefile
View file

@ -14,12 +14,6 @@ TARGET_BOOTSTRAP = yes
CONFIG := CONFIG :=
ifeq ($(DBG), 1)
CFLAGS_DBG := -g
else
CFLAGS_DBG :=
endif
LINKER_SCRIPT := ntoskrnl.lnk LINKER_SCRIPT := ntoskrnl.lnk
STRIP_FLAGS := -Wl,-s STRIP_FLAGS := -Wl,-s
@ -33,7 +27,7 @@ ifeq ($(KDBG), 1)
OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \ OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \
dbg/i386/kdb_help.o dbg/kdb_stabs.o dbg/kdb_symbols.o dbg/profile.o \ dbg/i386/kdb_help.o dbg/kdb_stabs.o dbg/kdb_symbols.o dbg/profile.o \
../dk/w32/lib/kjs.a dbg/i386/i386-dis.o ../dk/w32/lib/kjs.a dbg/i386/i386-dis.o
CFLAGS += -I../lib/kjs/include CFLAGS_KDBG := -I../lib/kjs/include
preall: all preall: all
../dk/w32/lib/kjs.a: ../dk/w32/lib/kjs.a:
@ -43,37 +37,26 @@ OBJECTS_KDBG :=
endif endif
ifeq ($(strip $(SDK_PATH_INC)),) ifeq ($(strip $(SDK_PATH_INC)),)
ASFLAGS += -I./include TARGET_ASFLAGS = -I./include
CFLAGS += -I./include -D__NTOSKRNL__ $(CFLAGS_DBG) -Wall -Werror $(CFLAGS_OPT) TARGET_CFLAGS = -I./include $(CFLAGS_KDBG) -Wall -Werror $(CFLAGS_OPT)
else else
ASFLAGS += -I./include -I$(SDK_PATH_INC) TARGET_ASFLAGS = -I./include -I$(SDK_PATH_INC)
CFLAGS += -I./include -I$(SDK_PATH_INC) -D__NTOSKRNL__ $(CFLAGS_DBG) -Wall -Werror $(CFLAGS_OPT) TARGET_CFLAGS = -I./include -I$(SDK_PATH_INC) -D__NTOSKRNL__ $(CFLAGS_KDBG) -Wall -Werror $(CFLAGS_OPT)
endif endif
# require os code to explicitly request A/W version of structs/functions # require os code to explicitly request A/W version of structs/functions
CFLAGS += -D_DISABLE_TIDENTS TARGET_CFLAGS += -D_DISABLE_TIDENTS
# no native setjmp/longjmp in the kernel
CFLAGS += -D_SEH_NO_NATIVE_NLG
# 3GB User Mode Memory Space support # 3GB User Mode Memory Space support
ifeq ($(3GB), 1) ifeq ($(3GB), 1)
CFLAGS += -D__3GB__ TARGET_CFLAGS += -D__3GB__
TARGET_BASE = 0xC0000000 TARGET_BASE = 0xC0000000
else else
TARGET_BASE = 0x80000000 TARGET_BASE = 0x80000000
endif endif
# enable thread event pair features (NT4 only!) # enable thread event pair features (NT4 only!)
# CFLAGS += -D_ENABLE_THRDEVTPAIR # TARGET_CFLAGS += -D_ENABLE_THRDEVTPAIR
CFLAGS += $(STD_CFLAGS)
ASFLAGS += $(STD_ASFLAGS)
RCFLAGS += $(STD_RCFLAGS)
TARGET_CFLAGS = $(CFLAGS)
TARGET_ASFLAGS = $(ASFLAGS)
TARGET_RCFLAGS = $(RCFLAGS)
# #
# Javascript extension for kdb # Javascript extension for kdb