Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 310 → Rev 311

/shark/trunk/config/mk/gnu.mk
1,3 → 1,5
include $(BASE)/shark.cfg
 
CPP = gcc
CC = gcc
AS = gcc
4,6 → 6,12
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
11,26 → 19,23
OSLIB_PATH = $(OSLIB)/lib
LIB_DIR = $(BASE)/lib
 
 
LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a
LIBRARYDIR= $(LIB_PATH)
LIBRARYOBJS= $(LIB_OBJS)
 
 
#LIBRARYPATHNAME= $(subst /,\,$(LIB_PATH)/lib$(LIBRARY).a)
#LIBRARYDIR= $(subst /,\,$(LIB_PATH))
#LIBRARYOBJS= $(subst /,\,$(LIB_OBJS))
 
 
C_WARN = -Wimplicit-function-declaration -Wall
C_FLAGS = -O -fno-builtin -nostdinc
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
C_MAC = -D__GNU__
C_MAC = -D__GNU__ $(CFG_OPT)
 
ASM_WARN =
ASM_FLAGS = -x assembler-with-cpp
ASM_INC = -I$(INCL) -I$(OSLIB)
ASM_MAC = -D__GNU__
ASM_MAC = -D__GNU__ $(CFG_OPT)
 
LINK_OPT = -Bstatic -Ttext 0x1720000 -b coff-go32 --oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
 
/shark/trunk/config/mk/linux.mk
6,7 → 6,6
LD = ld
AR = ar
 
 
INCL = $(BASE)/include
LIB_PATH = $(BASE)/lib
OSLIB = $(BASE)/oslib
27,16 → 26,16
C_WARN = -Wimplicit-function-declaration -Wall
C_FLAGS = -O -fno-builtin -nostdinc
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
C_MAC = -D__LINUX__
C_MAC = -D__LINUX__ $(CFG_OPT)
 
ASM_WARN =
ASM_FLAGS = -x assembler-with-cpp
ASM_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
ASM_MAC = -D__LINUX__
ASM_MAC = -D__LINUX__ $(CFG_OPT)
 
LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
 
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(CFG_OPT) $(C_FLAGS)
C_OPT = $(C_DEF) $(C_WARN) $(C_INC) $(C_MAC) $(C_FLAGS)
C_OUTPUT = -o $*.o
 
ASM_OPT = $(ASM_DEF) $(ASM_WARN) $(ASM_INC) $(ASM_MAC) $(ASM_FLAGS)
/shark/trunk/oslib/mk/gnu.mk
1,3 → 1,5
include $(BASE)/../shark.cfg
 
CC = gcc
AS = gcc
LD = ld
6,8 → 8,15
LIB_PATH = $(BASE)/lib/
LIB_DIR = $(BASE)\lib
 
C_OPT = -Wall -O -fno-builtin -nostdinc -D__TSC__ -D__GNU__ -I$(INCL) -DMAIN=__kernel_init__
ASM_OPT = -x assembler-with-cpp -D__GNU__ -I$(INCL)
ifeq ($(TSC),TRUE)
CFG_OPT = -D__TSC__
ifeq ($(APIC),TRUE)
CFG_OPT += -D__APIC__
endif
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)
 
MKDIR = md