diff options
| author | Pixel <pixel@nobis-crew.org> | 2009-11-06 05:28:01 +0100 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2009-11-06 05:28:01 +0100 |
| commit | df7b78c867d710d363efc6c0076c5e317b615ddd (patch) | |
| tree | 3d88f19c5f1bfcec73cfa9f8e27fa043f37fe8a6 | |
| parent | 8e9d933e47250613ac721ea72de8ab23dc44f2e9 (diff) | |
| parent | 501204b88927f4bcc0a7d6065a4a220af6fb0eed (diff) | |
Merge branch 'master' of ssh+git://pixel@git.grumpycoder.net/pub/repo.git/lua-interface
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | Makefile.mingw32 | 17 |
2 files changed, 19 insertions, 5 deletions
@@ -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) diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 6b54ef3..9ef4853 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -3,7 +3,7 @@ ifeq ($(SYSTEM),Darwin) CC = i386-mingw32-gcc CXX = i386-mingw32-g++ LD = i386-mingw32-g++ -STRIP = i386-mingw32-strip +STRIP = i386-mingw32-strip --strip-unneeded else ifeq ($(SYSTEM),MINGW32_NT-5.1) CC = gcc @@ -11,10 +11,18 @@ CXX = g++ LD = g++ STRIP = strip else +DISTRIB=$(shell cat /etc/issue | cut -f 1 -d\ | head -1) +ifeq ($(DISTRIB), CentOS) +CC = i686-pc-mingw32-gcc +CXX = i686-pc-mingw32-g++ +LD = i686-pc-mingw32-g++ +STRIP = i686-pc-mingw32-strip --strip-unneeded +else CC = i586-mingw32msvc-gcc CXX = i586-mingw32msvc-g++ LD = i586-mingw32msvc-g++ -STRIP = i586-mingw32msvc-strip +STRIP = i586-mingw32msvc-strip --strip-unneeded +endif endif endif @@ -218,6 +226,11 @@ ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES)))) all: dep luac.exe lua-interface.dll lua-interface.exe +dist: all + mkdir -p ../lua-interface-dist-win32 + $(STRIP) luac.exe lua-interface.dll lua-interface.exe + cp luac.exe lua-interface.dll lua-interface.exe ../lua-interface-dist-win32 + dep: $(ALL_DEPS) luac.exe: $(LUAC_OBJECTS) |