summaryrefslogtreecommitdiff
path: root/Makefile.mingw32
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2009-06-02 11:25:18 -0700
committerPixel <pixel@nobis-crew.org>2009-06-02 11:25:18 -0700
commitd6da338952d110597cba9106c14bee5f2e4627de (patch)
tree5a92aab7b898baec2930f1f293d0958a4714cdf3 /Makefile.mingw32
parentecd56dda3d15f8f7e19f527584b57263e68dc7d7 (diff)
parent001582d7ce9f2a1e6c095a14edaeb32b241f73ef (diff)
Merge branch 'master' of ssh+git://git-g/pub/repo.git/lua-interface
Diffstat (limited to 'Makefile.mingw32')
-rw-r--r--Makefile.mingw327
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.mingw32 b/Makefile.mingw32
index 7777bf2..7c7d219 100644
--- a/Makefile.mingw32
+++ b/Makefile.mingw32
@@ -5,11 +5,18 @@ CXX = i386-mingw32-g++
LD = i386-mingw32-g++
STRIP = i386-mingw32-strip
else
+ifeq ($(SYSTEM),MINGW32_NT-5.1)
+CC = gcc
+CXX = g++
+LD = g++
+STRIP = strip
+else
CC = i586-mingw32msvc-gcc
CXX = i586-mingw32msvc-g++
LD = i586-mingw32msvc-g++
STRIP = i586-mingw32msvc-strip
endif
+endif
INCLUDES = \
-I../mogltk/include \