Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 45 → Rev 48

/shark/trunk/config/libdep.mk
11,8 → 11,10
 
# --------------------------------------------------------------------------
# Library File names
ifndef GRAPH_DRV
GRAPH_DRV=grx
endif
 
 
# PXC
ifeq ($(LIB_PATH)/libhpxc.a,$(wildcard $(LIB_PATH)/libhpxc.a))
LINK_LIB += -lhpxc
45,9 → 47,11
 
# grx
ifeq ($(LIB_PATH)/libgrx.a,$(wildcard $(LIB_PATH)/libgrx.a))
ifeq ($(GRAPH_DRV),grx)
LINK_LIB += -lgrx
LIB_DEP += $(LIB_PATH)/libgrx.a
endif
endif
 
# hdev
ifeq ($(LIB_PATH)/libhdev.a,$(wildcard $(LIB_PATH)/libhdev.a))
163,7 → 167,35
LIB_DEP += $(LIB_PATH)/libpport.a
endif
 
# SVGA
ifeq ($(LIB_PATH)/libsvga.a,$(wildcard $(LIB_PATH)/libsvga.a))
ifeq ($(GRAPH_DRV),svga)
LINK_LIB += -lsvga
LIB_DEP += $(LIB_PATH)/libsvga.a
endif
endif
 
# OSMESA
ifeq ($(LIB_PATH)/libosmesa.a,$(wildcard $(LIB_PATH)/libosmesa.a))
LINK_LIB += -losmesa
LIB_DEP += $(LIB_PATH)/libosmesa.a
endif
 
# GLUT
ifeq ($(LIB_PATH)/libglut.a,$(wildcard $(LIB_PATH)/libglut.a))
LINK_LIB += -lglut
LIB_DEP += $(LIB_PATH)/libglut.a
endif
 
# GLU
ifeq ($(LIB_PATH)/libglu.a,$(wildcard $(LIB_PATH)/libglu.a))
LINK_LIB += -lglu
LIB_DEP += $(LIB_PATH)/libglu.a
endif
 
# PCL812
ifeq ($(LIB_PATH)/libpcl812.a,$(wildcard $(LIB_PATH)/libpcl812.a))
LINK_LIB += -lpcl812
LIB_DEP += $(LIB_PATH)/libpcl812.a
endif
 
/shark/trunk/config/mk/linux.mk
8,8 → 8,11
LIB_PATH = $(BASE)/lib
OSLIB_PATH = $(OSLIB)/lib
LIB_DIR = $(BASE)/lib
OSLIBINCL = $(OSLIB)
OTHERINCL =
ifneq ($(OSLIB),)
OTHERINCL = -I$(OSLIB)
else
OTHERINCL =
endif
 
LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a
LIBRARYDIR= $(LIB_PATH)
17,13 → 20,13
 
 
C_WARN = -Wimplicit-function-declaration -Wall
C_FLAGS = -O -finline-functions -fno-builtin -nostdinc
C_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIBINCL)
C_FLAGS = -O3 -finline-functions -fno-builtin -nostdinc
C_INC = -I$(INCL) $(OTHERINCL)
C_MAC = -D__LINUX__
 
ASM_WARN =
ASM_FLAGS = -x assembler-with-cpp
ASM_INC = -I$(INCL) $(OTHERINCL) -I$(OSLIBINC)
ASM_INC = -I$(INCL) $(OTHERINCL)
ASM_MAC = -D__LINUX__
 
LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH) -L$(OSLIB_PATH)
43,7 → 46,7
# Common rules
 
%.o : %.s
$(REDIR) $(CC) $(ASM_OPT) $(A_OUTPUT) -c $<
$(REDIR) $(CC) $(ASM_OPT) $(ASM_OUTPUT) -c $<
%.o : %.c
$(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -c $<
%.s : %.c
/shark/trunk/config/lib.mk
11,7 → 11,7
all:: lib$(LIBRARY).a
 
clean::
$(RM) *.o
$(RM) $(OBJS) *.o
$(RM) *.err
$(RM) lib$(LIBRARY).a