/shark/trunk/config/libdep.mk |
---|
34,15 → 34,15 |
endif |
# PCI |
# newpci |
# ---------------------------------------------------------------- |
ifeq ($(findstring __PCI__,$(USELIB)) , __PCI__) |
ifeq ($(findstring __NEWPCI__,$(USELIB)) , __NEWPCI__) |
INCL += -I$(BASE)/drivers/pci/include -I$(BASE)/drivers/linuxc26/include |
INCL += -I$(BASE)/drivers/newpci/include -I$(BASE)/drivers/linuxc26/include |
ifeq ($(LIB_PATH)/libpci.a,$(wildcard $(LIB_PATH)/libpci.a)) |
LINK_LIB += -lpci |
LIB_DEP += $(LIB_PATH)/libpci.a |
ifeq ($(LIB_PATH)/libnewpci.a,$(wildcard $(LIB_PATH)/libnewpci.a)) |
LINK_LIB += -lnewpci |
LIB_DEP += $(LIB_PATH)/libnewpci.a |
endif |
# newnet |
53,10 → 53,10 |
else |
# OLDPCI |
ifeq ($(LIB_PATH)/liboldpci.a,$(wildcard $(LIB_PATH)/liboldpci.a)) |
LINK_LIB += -loldpci |
LIB_DEP += $(LIB_PATH)/liboldpci.a |
# HPCI |
ifeq ($(LIB_PATH)/libhpci.a,$(wildcard $(LIB_PATH)/libhpci.a)) |
LINK_LIB += -lhpci |
LIB_DEP += $(LIB_PATH)/libhpci.a |
endif |
# hnet |
254,6 → 254,20 |
endif |
# SVGA |
# ---------------------------------------------------------------- |
ifeq ($(findstring __SVGA__,$(USELIB)) , __SVGA__) |
INCL += -I$(BASE)/drivers/svga/include |
ifeq ($(LIB_PATH)/libsvga.a,$(wildcard $(LIB_PATH)/libsvga.a)) |
LINK_LIB += -lsvga |
LIB_DEP += $(LIB_PATH)/libsvga.a |
endif |
endif |
# PCLAB |
# ---------------------------------------------------------------- |
ifeq ($(findstring __PCLAB__,$(USELIB)) , __PCLAB__) |
/shark/trunk/config/mk/gnu.mk |
---|
6,6 → 6,13 |
LD = ld |
AR = ar |
ifeq ($(TSC),TRUE) |
CFG_OPT += -D__TSC__ |
ifeq ($(APIC),TRUE) |
CFG_OPT += -D__APIC__ |
endif |
endif |
INCL = $(BASE)/include |
LIB_PATH = $(BASE)/lib |
OSLIB = $(BASE)/oslib |
16,24 → 23,10 |
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 |
#LIBRARYPATHNAME= $(subst /,\,$(LIB_PATH)/lib$(LIBRARY).a) |
#LIBRARYDIR= $(subst /,\,$(LIB_PATH)) |
#LIBRARYOBJS= $(subst /,\,$(LIB_OBJS)) |
ifeq ($(TSC),TRUE) |
CFG_OPT += -D__TSC__ |
ifeq ($(APIC),TRUE) |
CFG_OPT += -D__APIC__ |
endif |
endif |
ifeq ($(findstring VM86,$(BIOS)) , VM86) |
CFG_OPT += -DVM86 |
endif |
ifeq ($(findstring NEW,$(TRACER)) , NEW) |
CFG_OPT += -D__NEW_TRACER__ |
endif |
42,29 → 35,21 |
endif |
INCL += -I$(BASE)/tracer/include |
ifeq ($(findstring VESA,$(FB)) , VESA) |
CFG_VIDEO_OPT += -DCONFIG_FB_VESA -DCONFIG_LOGO |
ifeq ($(findstring VM86,$(BIOS)) , VM86) |
CFG_OPT += -DVM86 |
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 |
endif |
ifeq ($(findstring VGA16,$(FB)) , VGA16) |
CFG_VIDEO_OPT += -DCONFIG_FB_VGA16 |
endif |
C_WARN = -Wimplicit-function-declaration -Wall |
C_FLAGS = -O -fno-builtin -nostdinc |
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB) |
C_MAC = $(CFG_OPT) |
C_MAC = -D__GNU__ $(CFG_OPT) |
ASM_WARN = |
ASM_FLAGS = -x assembler-with-cpp |
ASM_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB) |
ASM_MAC = $(CFG_OPT) |
ASM_INC = -I$(INCL) -I$(OSLIB) |
ASM_MAC = -D__GNU__ $(CFG_OPT) |
LINK_OPT = -Bstatic -Ttext $(MEM_START) -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH) |
LINK_OPT = -Bstatic -Ttext $(MEM_START) -b coff-go32 --oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH) |
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(C_FLAGS) |
C_OUTPUT = -o $*.o |
72,14 → 57,17 |
ASM_OPT = $(ASM_DEF) $(ASM_WARN) $(ASM_INC) $(ASM_MAC) $(ASM_FLAGS) |
ASM_OUTPUT = -o $*.o |
MKDIR = mkdir |
MKDIR = md |
CP = cp |
CAT = cat |
CAT = @type |
RM = rm -f |
CD = cd |
#REDIR=redir -e $(*F).err |
REDIR= |
# Common rules |
%.o : %.s |
$(REDIR) $(CC) $(ASM_OPT) $(ASM_OUTPUT) -c $< |
%.o : %.c |
88,3 → 76,4 |
$(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -S $< |
%.o : %.cpp |
$(REDIR) $(CPP) $(C_OPT) $(C_OUTPUT) -c $< |
/shark/trunk/config/mk/linux.mk |
---|
16,13 → 16,6 |
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) |
46,9 → 39,7 |
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 |
57,12 → 48,12 |
C_WARN = -Wimplicit-function-declaration -Wall |
C_FLAGS = -O -fno-builtin -nostdinc |
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB) |
C_MAC = $(CFG_OPT) |
C_MAC = -D__LINUX__ $(CFG_OPT) |
ASM_WARN = |
ASM_FLAGS = -x assembler-with-cpp |
ASM_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB) |
ASM_MAC = $(CFG_OPT) |
ASM_MAC = -D__LINUX__ $(CFG_OPT) |
LINK_OPT = -Bstatic -Ttext $(MEM_START) -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH) |