diff options
| author | Pixel <pixel@nobis-crew.org> | 2009-11-05 11:56:41 -0800 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2009-11-05 11:56:41 -0800 |
| commit | 07819a10a89ee26f2f113ba0ec0bee7b03668680 (patch) | |
| tree | cea17cc2c4a79feeed01dd8fde233214fe75fcd6 | |
| parent | 38f828fc3c4c3437a13c06024bc37354a993778a (diff) | |
Adding CentOS mingw support, stripping and dist target support.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | Makefile.mingw32 | 17 |
2 files changed, 17 insertions, 3 deletions
@@ -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 7390d73..e910231 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 @@ -216,6 +224,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) |