summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile47
1 files changed, 2 insertions, 45 deletions
diff --git a/Makefile b/Makefile
index 419e214..d1b2c07 100644
--- a/Makefile
+++ b/Makefile
@@ -23,14 +23,13 @@ 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
-GL_GLUE=gl-glue-fat.o
STRIP = strip -x
ifeq ($(TRUESYSTEM),Linux)
CC = i686-apple-darwin9-gcc
CXX = i686-apple-darwin9-g++
LD = i686-apple-darwin9-g++ -arch i386
STRIP = i686-apple-darwin9-strip -x
-AS = i686-apple-darwin9-as
+AS = i686-apple-darwin9-as -arch i386
LIPO = i686-apple-darwin9-lipo
ARCH_FLAGS =
LDFLAGS_MESA = -all_load ../Mesa-7.4.4-darwin9/lib/libGLU.a ../Mesa-7.4.4-darwin9/lib/libOSMesa.a
@@ -247,53 +246,11 @@ lua-interface-hc.c : lua-interface.lua
%.c : %.lua
bin2c $< $@ $(basename $@)
-gl-glue-i386.dep:
- touch gl-glue-i386.dep
-
-gl-glue-x86_64.dep:
- touch gl-glue-x86_64.dep
-
-gl-glue-ppc.dep:
- touch gl-glue-ppc.dep
-
-gl-glue-ppc64.dep:
- touch gl-glue-ppc64.dep
-
gl-glue.dep:
touch gl-glue.dep
-gl-glue-fat.dep:
- touch gl-glue-fat.dep
-
-gl-glue-i386.s:
- src/generate-gl-glue.sh $(SYSTEM) i386 > gl-glue-i386.s
-
-gl-glue-x86_64.s:
- src/generate-gl-glue.sh $(SYSTEM) x86_64 > gl-glue-x86_64.s
-
-gl-glue-ppc.s:
- src/generate-gl-glue.sh $(SYSTEM) ppc > gl-glue-ppc.s
-
-gl-glue-ppc64.s:
- src/generate-gl-glue.sh $(SYSTEM) ppc64 > gl-glue-ppc64.s
-
gl-glue.s:
- src/generate-gl-glue.sh > gl-glue.s
-
-gl-glue-i386.o: gl-glue-i386.s
- $(AS) -arch i386 $< -o $@
-
-gl-glue-x86_64.o: gl-glue-x86_64.s
- $(AS) -arch x86_64 $< -o $@
-
-gl-glue-ppc.o: gl-glue-ppc.s
- $(AS) -arch ppc $< -o $@
-
-gl-glue-ppc64.o: gl-glue-ppc64.s
- $(AS) -arch ppc64 $< -o $@
-
-gl-glue-fat.o: gl-glue-i386.o gl-glue-x86_64.o gl-glue-ppc.o gl-glue-ppc64.o
- $(LIPO) -create $^ -output $@
+ src/generate-gl-glue.sh $(SYSTEM) > gl-glue.s
-include $(ALL_DEPS)