quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more makefile fixes

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@66 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-16 17:08:54 +00:00
parent 57a896dd96
commit 04c0ff0ad1
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile
View File

@ -20,6 +20,7 @@ RANLIB ?= ranlib
AR ?= ar AR ?= ar
PKGCONFIG ?= pkg-config PKGCONFIG ?= pkg-config
PKG_CONFIG_PATH ?= PKG_CONFIG_PATH ?=
export PKG_CONFIG_PATH
FIND ?= find FIND ?= find
MKDIR ?= mkdir -p MKDIR ?= mkdir -p
@ -32,16 +33,16 @@ CP_R ?= $(CP) -r
RM_R ?= $(RM) -r RM_R ?= $(RM) -r
TEE_STDERR ?= | tee /dev/stderr TEE_STDERR ?= | tee /dev/stderr
CPPFLAGS_GLIB ?= `$(PKGCONFIG) glib-2.0 --cflags` CPPFLAGS_GLIB ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) glib-2.0 --cflags)
LIBS_GLIB ?= `$(PKGCONFIG) glib-2.0 --libs-only-L` `pkg-config glib-2.0 --libs-only-l` LIBS_GLIB ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) glib-2.0 --libs-only-L) $(shellpkg-config glib-2.0 --libs-only-l)
CPPFLAGS_XML ?= `$(PKGCONFIG) libxml-2.0 --cflags` CPPFLAGS_XML ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libxml-2.0 --cflags)
LIBS_XML ?= `$(PKGCONFIG) libxml-2.0 --libs-only-L` `pkg-config libxml-2.0 --libs-only-l` LIBS_XML ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libxml-2.0 --libs-only-L) $(shellpkg-config libxml-2.0 --libs-only-l)
CPPFLAGS_PNG ?= `$(PKGCONFIG) libpng --cflags` CPPFLAGS_PNG ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libpng --cflags)
LIBS_PNG ?= `$(PKGCONFIG) libpng --libs-only-L` `pkg-config libpng --libs-only-l` LIBS_PNG ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) libpng --libs-only-L) $(shellpkg-config libpng --libs-only-l)
CPPFLAGS_GTK ?= `$(PKGCONFIG) gtk+-2.0 --cflags` CPPFLAGS_GTK ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --cflags)
LIBS_GTK ?= `$(PKGCONFIG) gtk+-2.0 --libs-only-L` `pkg-config gtk+-2.0 --libs-only-l` LIBS_GTK ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --libs-only-L) $(shellpkg-config gtk+-2.0 --libs-only-l)
CPPFLAGS_GTKGLEXT ?= `$(PKGCONFIG) gtkglext-1.0 --cflags` CPPFLAGS_GTKGLEXT ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtkglext-1.0 --cflags)
LIBS_GTKGLEXT ?= `$(PKGCONFIG) gtkglext-1.0 --libs-only-L` `pkg-config gtkglext-1.0 --libs-only-l` LIBS_GTKGLEXT ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtkglext-1.0 --libs-only-L) $(shellpkg-config gtkglext-1.0 --libs-only-l)
CPPFLAGS_GL ?= CPPFLAGS_GL ?=
LIBS_GL ?= -lGL # -lopengl32 on Win32 LIBS_GL ?= -lGL # -lopengl32 on Win32
CPPFLAGS_DL ?= CPPFLAGS_DL ?=
@ -51,15 +52,14 @@ LIBS_ZLIB ?= -lz
DEPEND_ON_MAKEFILE ?= yes DEPEND_ON_MAKEFILE ?= yes
# these are used on Win32 only # these are used on Win32 only
GTKDIR ?= `$(PKGCONFIG) gtk+-2.0 --variable=prefix` GTKDIR ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix)
WHICHDLL ?= which WHICHDLL ?= which
export WHICHDLL export MKDIR
export GTKDIR
export CP export CP
export CAT export CAT
export MKDIR export GTKDIR
export PKG_CONFIG_PATH export WHICHDLL
# alias mingw32 OSes # alias mingw32 OSes
ifeq ($(OS),MINGW32_NT-6.0) ifeq ($(OS),MINGW32_NT-6.0)
@ -106,9 +106,9 @@ else ifeq ($(OS),Win32)
# workaround: we have no "ldd" for Win32, so... # workaround: we have no "ldd" for Win32, so...
LDD = LDD =
# workaround: OpenGL library for Win32 is called opengl32.dll # workaround: OpenGL library for Win32 is called opengl32.dll
LIBS_GL ?= -lopengl32 LIBS_GL = -lopengl32
# workaround: no -ldl on Win32 # workaround: no -ldl on Win32
LIBS_DL ?= LIBS_DL =
#else ifeq ($(OS),Darwin) #else ifeq ($(OS),Darwin)
# EXE = ppc # EXE = ppc
else else