WebSVN - shark - Path Comparison - /shark/branches/pj/config Rev 2 and /shark/tags/rel_0

Ignore whitespace Rev 2 → Rev 102

 /shark/tags/rel_0_5/config/example.mk
 ,10 → 26,10
 MYOBJS= $(addsuffix .c,$(PROGS)) $(OBJS)
 depend:
-        $(CC) $(C_OPT) -M $(MYOBJS:.o=.c) > deps
+        $(CC) $(C_OPT) -M $(wildcard $(MYOBJS:.o=.c) $(MYOBJS:.o=.s)) > deps
 deps:
-        $(CC) $(C_OPT) -M $(MYOBJS:.o=.c) > deps
+        $(CC) $(C_OPT) -M $(wildcard $(MYOBJS:.o=.c) $(MYOBJS:.o=.s)) > deps

/shark/tags/rel_0_5/config/example2.mk
2,6 → 2,7
ifndef BASE
BASE=../..
endif

include $(BASE)/config/config.mk

include $(BASE)/config/libdep.mk

 /shark/tags/rel_0_5/config/objs.mk
 ,7 → 34,7
         -rm -f $(LIB_OBJS)
 depend deps:
-        $(CC) $(C_OPT) -M $(OBJS:.o=.c) > deps
+        $(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.s)) > deps
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),cleanall)

 /shark/tags/rel_0_5/config/libdep.mk
 ,17 → 2,19
 # this file contains the library dependencies
 #
+OSLIB_LIB=$(OSLIB)/lib
-LINK_STARTUP = $(LIB_PATH)/x0.o
+LINK_STARTUP = $(OSLIB_LIB)/x0.o
 LINK_LIB =
 LIB_DEP =
 # --------------------------------------------------------------------------
 # Library File names
+ifndef GRAPH_DRV
+GRAPH_DRV=grx
+endif
 # PXC
 ifeq ($(LIB_PATH)/libhpxc.a,$(wildcard $(LIB_PATH)/libhpxc.a))
 LINK_LIB += -lhpxc
 ,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))
 ,29 → 84,35
 endif
 # kl
-ifeq ($(LIB_PATH)/libkl.a,$(wildcard $(LIB_PATH)/libkl.a))
+ifeq ($(OSLIB_LIB)/libkl.a,$(wildcard $(OSLIB_LIB)/libkl.a))
 LINK_LIB += -lkl
-LIB_DEP += $(LIB_PATH)/libkl.a
+LIB_DEP += $(OSLIB_LIB)/libkl.a
 endif
 # hx
-ifeq ($(LIB_PATH)/libhx.a,$(wildcard $(LIB_PATH)/libhx.a))
+ifeq ($(OSLIB_LIB)/libhx.a,$(wildcard $(OSLIB_LIB)/libhx.a))
 LINK_LIB += -lhx
-LIB_DEP += $(LIB_PATH)/libhx.a
+LIB_DEP += $(OSLIB_LIB)/libhx.a
 endif
 # hc
-ifeq ($(LIB_PATH)/libhc.a,$(wildcard $(LIB_PATH)/libhc.a))
+ifeq ($(OSLIB_LIB)/libhc.a,$(wildcard $(OSLIB_LIB)/libhc.a))
 LINK_LIB += -lhc
-LIB_DEP += $(LIB_PATH)/libhc.a
+LIB_DEP += $(OSLIB_LIB)/libhc.a
 endif
 # hm
-ifeq ($(LIB_PATH)/libhm.a,$(wildcard $(LIB_PATH)/libhm.a))
+ifeq ($(OSLIB_LIB)/libhm.a,$(wildcard $(OSLIB_LIB)/libhm.a))
 LINK_LIB += -lhm
-LIB_DEP += $(LIB_PATH)/libhm.a
+LIB_DEP += $(OSLIB_LIB)/libhm.a
 endif
+# cons
+ifeq ($(LIB_PATH)/libcons.a,$(wildcard $(LIB_PATH)/libcons.a))
+LINK_LIB += -lcons
+LIB_DEP += $(LIB_PATH)/libcons.a
+endif
 # blk
 ifeq ($(LIB_PATH)/libblk.a,$(wildcard $(LIB_PATH)/libblk.a))
 LINK_LIB += -lblk
 ,8 → 161,47
 LIB_DEP += $(LIB_PATH)/lib6025e.a
 endif
+# Parport
+ifeq ($(LIB_PATH)/libpport.a,$(wildcard $(LIB_PATH)/libpport.a))
+LINK_LIB += -lpport
+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
+# PNG
+ifeq ($(LIB_PATH)/libpng.a,$(wildcard $(LIB_PATH)/libpng.a))
+LINK_LIB += -lpng
+LIB_DEP += $(LIB_PATH)/libpng.a
+endif

 /shark/tags/rel_0_5/config/sublib.mk
 ,10 → 24,10
         $(RM) *.??~
 depend::
-        $(CC) $(C_OPT) -M $(OBJS:.o=.c) > deps
+        $(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.s)) > deps
 deps:
-        $(CC) $(C_OPT) -M $(OBJS:.o=.c) > deps
+        $(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.s)) > deps
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),cleanall)

 /shark/tags/rel_0_5/config/mk/linux.mk
 ,3 → 1,4
+CPP = gcc
 CC  = gcc
 AS  = gcc
 LD  = ld
 ,7 → 6,9
 INCL   = $(BASE)/include
-LIB_PATH    = $(BASE)/lib/
+LIB_PATH    = $(BASE)/lib
+OSLIB = $(BASE)/oslib
+OSLIB_PATH = $(OSLIB)/lib
 LIB_DIR  = $(BASE)/lib
 LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a
 ,18 → 15,19
 LIBRARYDIR= $(LIB_PATH)
 LIBRARYOBJS= $(LIB_OBJS)
+# Linux.mk for gcc 2.x
 C_WARN       = -Wimplicit-function-declaration -Wall
 C_FLAGS      = -O -finline-functions -fno-builtin -nostdinc
-C_INC        = -I$(INCL) $(OTHERINCL)
+C_INC        = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
 C_MAC        = -D__LINUX__
 ASM_WARN     =
 ASM_FLAGS    = -x assembler-with-cpp
-ASM_INC      = -I$(INCL)
+ASM_INC      = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
 ASM_MAC      = -D__LINUX__
-LINK_OPT = -Bstatic -Ttext 0x220000 -s -nostartfiles -nostdlib -L$(LIB_PATH)
+LINK_OPT = -Bstatic -Ttext 0x220000 -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
 ,9 → 44,10
 # 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
         $(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -S $<
+%.o : %.cpp
+        $(REDIR) $(CPP) $(C_OPT) $(C_OUTPUT) -c $<

 /shark/tags/rel_0_5/config/mk/linux32.mk
 ,0 → 1,53
+CPP = gcc
+CC  = gcc
+AS  = gcc
+LD  = ld
+AR  = ar
+INCL   = $(BASE)/include
+LIB_PATH    = $(BASE)/lib
+OSLIB = $(BASE)/oslib
+OSLIB_PATH = $(OSLIB)/lib
+LIB_DIR  = $(BASE)/lib
+LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a
+LIBRARYDIR= $(LIB_PATH)
+LIBRARYOBJS= $(LIB_OBJS)
+# Linux32.mk for gcc 3.2
+C_WARN       = -Wimplicit-function-declaration -Wall
+C_FLAGS      = -O -fno-builtin -nostdinc
+C_INC        = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
+C_MAC        = -D__LINUX__
+ASM_WARN     =
+ASM_FLAGS    = -x assembler-with-cpp
+ASM_INC      = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
+ASM_MAC      = -D__LINUX__
+LINK_OPT = -Bstatic -Ttext 0x220000 -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
+ASM_OPT      = $(ASM_DEF) $(ASM_WARN) $(ASM_INC) $(ASM_MAC) $(ASM_FLAGS)
+ASM_OUTPUT   = -o $*.o
+MKDIR   = mkdir
+CP      = cp
+CAT     = cat
+RM      = rm -f
+CD      = cd
+# Common rules
+%.o : %.s
+        $(REDIR) $(CC) $(ASM_OPT) $(ASM_OUTPUT) -c $<
+%.o : %.c
+        $(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -c $<
+%.s : %.c
+        $(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -S $<
+%.o : %.cpp
+        $(REDIR) $(CPP) $(C_OPT) $(C_OUTPUT) -c $<

 /shark/tags/rel_0_5/config/mk/gnu.mk
 ,3 → 1,4
+CPP = gcc
 CC  = gcc
 AS  = gcc
 LD  = ld
 ,8 → 7,11
 INCL   = $(BASE)/include
 LIB_PATH    = $(BASE)/lib
+OSLIB = $(BASE)/oslib
+OSLIB_PATH = $(OSLIB)/lib
 LIB_DIR  = $(BASE)/lib
 LIBRARYPATHNAME= $(LIB_PATH)/lib$(LIBRARY).a
 LIBRARYDIR= $(LIB_PATH)
 LIBRARYOBJS= $(LIB_OBJS)
 ,15 → 24,15
 C_WARN       = -Wimplicit-function-declaration -Wall
 C_FLAGS      = -O -finline-functions -fno-builtin -nostdinc
-C_INC        = -I$(INCL) $(OTHERINCL)
+C_INC        = -I$(INCL) $(OTHERINCL) -I$(OSLIB)
 C_MAC        = -D__GNU__
 ASM_WARN     =
 ASM_FLAGS    = -x assembler-with-cpp
-ASM_INC      = -I$(INCL)
+ASM_INC      = -I$(INCL) -I$(OSLIB)
 ASM_MAC      = -D__GNU__
-LINK_OPT = -Bstatic -Ttext 0x1720000 -oformat coff-go32 -s -nostartfiles -nostdlib -L$(LIB_PATH)
+LINK_OPT = -Bstatic -Ttext 0x1720000 -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
 ,4 → 57,6
         $(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -c $<
 %.s : %.c
         $(REDIR) $(CC) $(C_OPT) $(C_OUTPUT) -S $<
+%.o : %.cpp
+        $(REDIR) $(CPP) $(C_OPT) $(C_OUTPUT) -c $<

/shark/tags/rel_0_5/config/mk/oldgnu.mk
1,3 → 1,5
#makefile for an old gcc version. maybe obsolete

CC = gcc
AS = gcc
LD = ld

 /shark/tags/rel_0_5/config/lib.mk
 ,7 → 11,7
 all:: lib$(LIBRARY).a
 clean::
-        $(RM) *.o
+        $(RM) $(OBJS) *.o
         $(RM) *.err
         $(RM) lib$(LIBRARY).a
 ,10 → 24,10
         $(RM) $(LIBRARYPATHNAME)
 depend::
-        $(CC) $(C_OPT) -M $(OBJS:.o=.c) > deps
+        $(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.cpp) $(OBJS:.o=.s)) > deps
 deps:
-        $(CC) $(C_OPT) -M $(OBJS:.o=.c) > deps
+        $(CC) $(C_OPT) -M $(wildcard $(OBJS:.o=.c) $(OBJS:.o=.cpp) $(OBJS:.o=.s)) > deps
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),cleanall)

Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 2 → Rev 102

/shark/tags/rel_0_5/config/hconf/hconf
File deleted
\ No newline at end of file