summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2009-11-06 05:28:01 +0100
committerPixel <pixel@nobis-crew.org>2009-11-06 05:28:01 +0100
commitdf7b78c867d710d363efc6c0076c5e317b615ddd (patch)
tree3d88f19c5f1bfcec73cfa9f8e27fa043f37fe8a6 /Makefile
parent8e9d933e47250613ac721ea72de8ab23dc44f2e9 (diff)
parent501204b88927f4bcc0a7d6065a4a220af6fb0eed (diff)
Merge branch 'master' of ssh+git://pixel@git.grumpycoder.net/pub/repo.git/lua-interface
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f2cb29c..0d14390 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,14 @@ MACHINE=$(shell uname -m)
DISTRIB=$(shell cat /etc/issue | cut -f 1 -d\ | head -1)
GL_GLUE=gl-glue.s
ifeq ($(SYSTEM),Darwin)
-ARCH_FLAGS=-arch i386 -arch x86_64 -arch ppc
+ARCH_FLAGS=-arch i386
LDFLAGS_MESA=-all_load ../Mesa-7.4.4/lib/libGLU.a ../Mesa-7.4.4/lib/libmesa.a ../Mesa-7.4.4/lib/libglapi.a ../Mesa-7.4.4/lib/osmesa.o
CPPFLAGS_READLINE=
LDFLAGS_READLINE=-lreadline -lncurses
SHARED_FLAGS=-dynamiclib
SHARED_EXT=dylib
LIBS=-liconv
-LD = g++
+LD = g++ -arch i386
LDFLAGS_GL = -L/usr/X11/lib -lGLU -lGL -X11 -dylib_file \
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
@@ -37,7 +37,7 @@ LDFLAGS_GL = -lGLU -lGL
endif
CC = gcc
CXX = g++
-STRIP = strip
+STRIP = strip --strip-unneeded
INCLUDES = \
-I../mogltk/include \
@@ -236,6 +236,7 @@ all: dep luac lua-interface
dist: luac lua-interface lua-interface-gl.$(SHARED_EXT)
mkdir -p ../lua-interface-dist
ln -sf lua-interface-mesa.$(SHARED_EXT) lua-interface.$(SHARED_EXT)
+ $(STRIP) $+
cp luac lua-interface lua-interface*.$(SHARED_EXT) ../lua-interface-dist
dep: $(ALL_DEPS)