Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 558 → Rev 588

/shark/trunk/config/mk/linux.mk
16,6 → 16,13
LIBRARYDIR= $(LIB_PATH)
LIBRARYOBJS= $(LIB_OBJS)
 
ifeq ($(findstring LINUX,$(ENV)) , LINUX)
CFG_OPT += -D__LINUX__
endif
ifeq ($(findstring DJGPP,$(ENV)) , DJGPP)
CFG_OPT += -D__GNU__
endif
 
ifeq ($(TSC),TRUE)
CFG_OPT += -D__TSC__
ifeq ($(APIC),TRUE)
39,7 → 46,9
CFG_VIDEO_OPT += -DCONFIG_FB_VESA -DCONFIG_LOGO
endif
ifeq ($(findstring FINDPCI,$(FB)) , FINDPCI)
CFG_VIDEO_OPT += -DCONFIG_FB_RIVA -DCONFIG_FB_RADEON -DCONFIG_FB_MATROX -DCONFIG_LOGO -DCONFIG_FB_MATROX_G100 -DCONFIG_FB_MATROX_MILLENIUM -DCONFIG_FB_MATROX_MYSTIQUE
CFG_VIDEO_OPT += -DCONFIG_FB_RIVA -DCONFIG_FB_RADEON -DCONFIG_FB_MATROX\
-DCONFIG_LOGO -DCONFIG_FB_MATROX_G100 -DCONFIG_FB_MATROX_MILLENIUM\
-DCONFIG_FB_MATROX_MYSTIQUE
endif
ifeq ($(findstring VGA16,$(FB)) , VGA16)
CFG_VIDEO_OPT += -DCONFIG_FB_VGA16
48,12 → 57,12
C_WARN = -Wimplicit-function-declaration -Wall
C_FLAGS = -O -fno-builtin -nostdinc
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
C_MAC = -D__LINUX__ $(CFG_OPT)
C_MAC = $(CFG_OPT)
 
ASM_WARN =
ASM_FLAGS = -x assembler-with-cpp
ASM_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
ASM_MAC = -D__LINUX__ $(CFG_OPT)
ASM_MAC = $(CFG_OPT)
 
LINK_OPT = -Bstatic -Ttext $(MEM_START) -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)