Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 587 → Rev 588

/shark/trunk/oslib/mk/gnu.mk
6,10 → 6,17
AR = ar
INCL = $(BASE)
LIB_PATH = $(BASE)/lib/
LIB_DIR = $(BASE)\lib
LIB_DIR = $(BASE)/lib
 
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__
CFG_OPT += -D__TSC__
ifeq ($(APIC),TRUE)
CFG_OPT += -D__APIC__
endif
36,18 → 43,22
CFG_OPT += -D__OLD_TRACER__
endif
 
C_OPT = -Wall -O -fno-builtin -nostdinc $(CFG_OPT) -D__GNU__ -I$(INCL) -DMAIN=__kernel_init__
ASM_OPT = -x assembler-with-cpp $(CFG_OPT) -D__GNU__ -I$(INCL)
LINK_OPT = -T $(BASE)/mk/os.x -Bstatic -Ttext 0x320000 -oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH)
C_OPT = -Wall -O -fno-builtin -nostdinc $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
ASM_OPT = -x assembler-with-cpp $(CFG_OPT) -I$(INCL)
LINK_OPT = -Bstatic -Ttext $(MEM_START) -s -nostartfiles -nostdlib -L$(LIB_PATH)
 
MKDIR = md
MKDIR = mkdir
CP = cp
CAT = @type
RM = -del
RMDIR = -deltree
CAT = cat
RM = rm -f
RMDIR = rm -rf
 
# Common rules
 
%.o : %.s
$(REDIR) $(CC) $(ASM_OPT) -c $<
%.o : %.c
$(REDIR) $(CC) $(C_OPT) -c $<
%.s : %.c
$(REDIR) $(CC) $(C_OPT) -S $<
 
/shark/trunk/oslib/mk/linux.mk
8,6 → 8,13
LIB_PATH = $(BASE)/lib/
LIB_DIR = $(BASE)/lib
 
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)
36,9 → 43,9
CFG_OPT += -D__OLD_TRACER__
endif
 
C_OPT = -Wall -O -fno-builtin -nostdinc -D__LINUX__ $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
ASM_OPT = -x assembler-with-cpp -D__LINUX__ $(CFG_OPT) -I$(INCL)
LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH)
C_OPT = -Wall -O -fno-builtin -nostdinc $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
ASM_OPT = -x assembler-with-cpp $(CFG_OPT) -I$(INCL)
LINK_OPT = -Bstatic -Ttext $(MEM_START) -s -nostartfiles -nostdlib -L$(LIB_PATH)
 
MKDIR = mkdir
CP = cp