janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +01:00
Code Activity

defs-orig.mk: Make it work with gcc-3.0.3

Browse source
This commit is contained in:
Jan Lindemann 2002-01-04 14:21:03 +00:00 • committed by Jan Lindemann
commit 9b094fb2e3
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
make/defs-orig.mk
View file

@ -24,6 +24,11 @@ DIST_WINVERSION = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//") LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//") LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
GCC_VERSION = $(shell gcc -v 2>&1 | grep version | awk '{ print $$3;}')
GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[1];}')
GCC_MINOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[2];}')
GCC_REV = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[3];}')
#ifndef $(TOPDIR) #ifndef $(TOPDIR)
# TOPDIR := $(MODDIR) # TOPDIR := $(MODDIR)
#endif #endif
@ -83,7 +88,14 @@ CFLAGS = $(INCLUDE) $(PROJECT_CFLAGS) $(CFLAGS_DEBUG) $(LOCAL_CFLAGS) $
CPPFLAGS = $(INCLUDE) $(PROJECT_CPPFLAGS) $(CPPFLAGS_DEBUG) $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS) CPPFLAGS = $(INCLUDE) $(PROJECT_CPPFLAGS) $(CPPFLAGS_DEBUG) $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS)
LDFFTW = -lrfftw -lfftw -lm LDFFTW = -lrfftw -lfftw -lm
#LDAUDIO = -laudiofile #LDAUDIO = -laudiofile
LDFLAGS = -L$(LIBDIR) -l$(LIBNAME) -lg++ -lstdc++ $(PROJECT_LDFLAGS) $(LOCAL_LDFLAGS)
ifeq ($(GCC_MAJOR),2)
LPPFLAGS = -lg++ -lstdc++
else
LPPFLAGS = -lg++-3 -lstdc++ -L/usr/local/lib
endif
LDFLAGS = -L$(LIBDIR) -l$(LIBNAME) $(LPPFLAGS) $(PROJECT_LDFLAGS) $(LOCAL_LDFLAGS)
LDREST = -ldl $(LDAUDIO) $(LDFFTW) LDREST = -ldl $(LDAUDIO) $(LDFFTW)
CC = $(YAMD)gcc CC = $(YAMD)gcc
CPP = $(YAMD)g++ CPP = $(YAMD)g++
@ -91,11 +103,6 @@ RM = rm
AR = ar AR = ar
INSTALL = install INSTALL = install
GCC_VERSION = $(shell gcc -v 2>&1 | grep version | awk '{ print $3;}')
GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($3,a,"."); print a[1];}')
GCC_MINOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($3,a,"."); print a[2];}')
GCC_REV = $(shell gcc -v 2>&1 | grep version | awk '{ split($3,a,"."); print a[3];}')
define make_subdirs define make_subdirs
set -e; for D in $(SUBDIRS) ; do make -C $$D ; done set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
endef endef