diff options
| author | Nicolas Noble <pixel@nobis-crew.org> | 2009-11-05 11:55:26 -0800 |
|---|---|---|
| committer | Nicolas Noble <pixel@nobis-crew.org> | 2009-11-05 11:55:26 -0800 |
| commit | a0119380e242de8122d3ffd813c8eed61d2a27f1 (patch) | |
| tree | 71f59169ed6f07a15b7f64de735f2ba7f067e984 | |
| parent | d2003726de81dfb729b64195878f4aedcd305b84 (diff) | |
Adding CentOS mingw support, stripping and dist target support.
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | Makefile.mingw32 | 19 |
2 files changed, 24 insertions, 4 deletions
@@ -13,7 +13,7 @@ LD = g++ -m32 endif CC = gcc CXX = g++ -STRIP = strip +STRIP = strip --strip-unneeded INCLUDES = \ -I../Baltisot/include \ @@ -65,6 +65,11 @@ ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES)))) all: dep modules +dist: modules + mkdir -p ../lua-interface-dist + $(STRIP) $(MODULES_LIST) + cp $(MODULES_LIST) ../lua-interface-dist + modules: $(MODULES_LIST) dep: $(ALL_DEPS) @@ -94,3 +99,5 @@ clean: ./luac -o $@ $< -include $(ALL_DEPS) + +.PHONY: clean dist diff --git a/Makefile.mingw32 b/Makefile.mingw32 index 3cd8ceb..cfd7652 100644 --- a/Makefile.mingw32 +++ b/Makefile.mingw32 @@ -3,18 +3,26 @@ 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 CXX = g++ LD = g++ -STRIP = strip +STRIP = strip --strip-unneeded +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 @@ -68,6 +76,11 @@ ALL_DEPS = $(addsuffix .dep, $(notdir $(basename $(WHOLE_SOURCES)))) all: dep modules +dist: modules + mkdir -p ../lua-interface-dist-win32 + $(STRIP) $(MODULES_LIST) + cp $(MODULES_LIST) ../lua-interface-dist-win32 + modules: $(ALL_OBJECTS) $(MODULES_LIST) dep: $(ALL_DEPS) |