Update these files as well
This commit is contained in:
parent
6dee38b998
commit
eadc09e9f6
9
Makefile
9
Makefile
|
|
@ -193,17 +193,14 @@ ifeq ($(OS),Darwin)
|
||||||
CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
|
CPPFLAGS_COMMON += -DPOSIX -DXWINDOWS
|
||||||
CFLAGS_COMMON += -fPIC
|
CFLAGS_COMMON += -fPIC
|
||||||
CXXFLAGS_COMMON += -fno-exceptions -fno-rtti
|
CXXFLAGS_COMMON += -fno-exceptions -fno-rtti
|
||||||
CPPFLAGS_COMMON += -I/sw/include -I/usr/X11R6/include
|
CPPFLAGS_COMMON += -I/opt/local/include -I/sw/include -I/usr/X11R6/include
|
||||||
LDFLAGS_COMMON += -L/sw/lib -L/usr/X11R6/lib
|
LDFLAGS_COMMON += -L/opt/local/lib -L/sw/lib -L/usr/X11R6/lib
|
||||||
#LDFLAGS_COMMON += -L/sw/lib -L/usr/lib -L/usr/X11R6/lib
|
|
||||||
LDFLAGS_DLL += -dynamiclib -ldl
|
LDFLAGS_DLL += -dynamiclib -ldl
|
||||||
EXE ?= ppc
|
EXE ?= ppc
|
||||||
MACLIBDIR ?= /sw/lib
|
MACLIBDIR ?= /opt/local/lib
|
||||||
A = a
|
A = a
|
||||||
DLL = dylib
|
DLL = dylib
|
||||||
MWINDOWS =
|
MWINDOWS =
|
||||||
MACVERSION ?= 16
|
|
||||||
CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
|
|
||||||
# workaround for weird prints
|
# workaround for weird prints
|
||||||
ECHO_NOLF = /bin/echo -n
|
ECHO_NOLF = /bin/echo -n
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,6 @@
|
||||||
# BUILD=debug
|
# BUILD=debug
|
||||||
# RADIANT_ABOUTMSG=Custom build
|
# RADIANT_ABOUTMSG=Custom build
|
||||||
# EXE=ub
|
# EXE=ub
|
||||||
#
|
|
||||||
## MacPorts:
|
|
||||||
# CPPFLAGS=-I/opt/local/include/ -I/usr/X11R6/include/
|
|
||||||
# LDFLAGS=-L/opt/local/lib -L/usr/X11R6/lib
|
|
||||||
# MACLIBDIR=/opt/local/lib
|
|
||||||
|
|
||||||
## Fink
|
## Fink
|
||||||
## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6)
|
## (-arch ppc can combined with -arch 386, I read somewhere. However does work fine like this on OSX 10.6)
|
||||||
|
|
@ -16,3 +11,7 @@
|
||||||
# CFLAGS=-arch i386
|
# CFLAGS=-arch i386
|
||||||
# TARGET_ARCH=-arch i386
|
# TARGET_ARCH=-arch i386
|
||||||
# MACLIBDIR=/sw/lib
|
# MACLIBDIR=/sw/lib
|
||||||
|
|
||||||
|
## On some versions of OSX you may get compile errors regarding glTexImage1D, uncomment this to fix it
|
||||||
|
#MACVERSION ?= 16
|
||||||
|
#CPPFLAGS_COMMON += -DMACVERSION="$(MACVERSION)"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user