Commit 6bac503b authored by ikits's avatar ikits
Browse files

makefile fixes


git-svn-id: https://glew.svn.sourceforge.net/svnroot/glew/trunk/glew@339 783a27ee-832a-0410-bc00-9f386506c6dd
parent 0e9497e9
...@@ -90,7 +90,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS) ...@@ -90,7 +90,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS)
lib/$(LIB.SHARED): $(LIB.SOBJS) lib/$(LIB.SHARED): $(LIB.SOBJS)
$(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
ifeq ($(patsubst MINGW32%,MINGW32,$(SYSTEM)), MINGW32) ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
else else
$(LN) $(LIB.SHARED) lib/$(LIB.SONAME) $(LN) $(LIB.SHARED) lib/$(LIB.SONAME)
$(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK) $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK)
...@@ -117,10 +117,10 @@ install: all ...@@ -117,10 +117,10 @@ install: all
$(INSTALL) -d -m 0755 $(GLEW_DEST)/include/GL $(INSTALL) -d -m 0755 $(GLEW_DEST)/include/GL
$(INSTALL) -d -m 0755 $(GLEW_DEST)/lib $(INSTALL) -d -m 0755 $(GLEW_DEST)/lib
# runtime # runtime
ifeq ($(patsubst MINGW32%,MINGW32,$(SYSTEM)), MINGW32) ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
$(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/bin/ $(INSTALL) $(STRIP) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/bin/
else else
ifeq ($(patsubst Darwin%,Darwin,$(SYSTEM)), Darwin) ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
strip -x lib/$(LIB.SHARED) strip -x lib/$(LIB.SHARED)
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/lib/ $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(GLEW_DEST)/lib/
$(LN) $(LIB.SHARED) $(GLEW_DEST)/lib/$(LIB.SONAME) $(LN) $(LIB.SHARED) $(GLEW_DEST)/lib/$(LIB.SONAME)
...@@ -133,10 +133,10 @@ endif ...@@ -133,10 +133,10 @@ endif
$(INSTALL) -m 0644 include/GL/wglew.h $(GLEW_DEST)/include/GL $(INSTALL) -m 0644 include/GL/wglew.h $(GLEW_DEST)/include/GL
$(INSTALL) -m 0644 include/GL/glew.h $(GLEW_DEST)/include/GL $(INSTALL) -m 0644 include/GL/glew.h $(GLEW_DEST)/include/GL
$(INSTALL) -m 0644 include/GL/glxew.h $(GLEW_DEST)/include/GL $(INSTALL) -m 0644 include/GL/glxew.h $(GLEW_DEST)/include/GL
ifeq ($(patsubst MINGW32%,MINGW32,$(SYSTEM)), MINGW32) ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
$(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(GLEW_DEST)/lib/ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(GLEW_DEST)/lib/
else else
ifeq ($(patsubst Darwin%,Darwin,$(SYSTEM)), Darwin) ifeq ($(patsubst darwin%,darwin,$(SYSTEM)), darwin)
strip -x lib/$(LIB.STATIC) strip -x lib/$(LIB.STATIC)
$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(GLEW_DEST)/lib/ $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(GLEW_DEST)/lib/
$(LN) $(LIB.SHARED) $(GLEW_DEST)/lib/$(LIB.DEVLNK) $(LN) $(LIB.SHARED) $(GLEW_DEST)/lib/$(LIB.DEVLNK)
...@@ -153,7 +153,7 @@ uninstall: ...@@ -153,7 +153,7 @@ uninstall:
$(RM) $(GLEW_DEST)/include/GL/glew.h $(RM) $(GLEW_DEST)/include/GL/glew.h
$(RM) $(GLEW_DEST)/include/GL/glxew.h $(RM) $(GLEW_DEST)/include/GL/glxew.h
$(RM) $(GLEW_DEST)/lib/$(LIB.DEVLNK) $(RM) $(GLEW_DEST)/lib/$(LIB.DEVLNK)
ifeq ($(patsubst MINGW32%,MINGW32,$(SYSTEM)), MINGW32) ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
$(RM) $(GLEW_DEST)/bin/$(LIB.SHARED) $(RM) $(GLEW_DEST)/bin/$(LIB.SHARED)
else else
$(RM) $(GLEW_DEST)/lib/$(LIB.SONAME) $(RM) $(GLEW_DEST)/lib/$(LIB.SONAME)
......
NAME = glew32 NAME = glew32
CC = gcc CC = gcc -mno-cygwin
# use gcc for linking, with ld it does not work # use gcc for linking, with ld it does not work
LD = gcc LD = gcc -mno-cygwin
ifneq (undefined, $(origin GLEW_MX)) ifneq (undefined, $(origin GLEW_MX))
CFLAGS.EXTRA = -DGLEW_MX CFLAGS.EXTRA = -DGLEW_MX
endif endif
...@@ -13,7 +13,7 @@ LDFLAGS.EXTRA = -L/mingw/lib ...@@ -13,7 +13,7 @@ LDFLAGS.EXTRA = -L/mingw/lib
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
BIN.SUFFIX = .exe BIN.SUFFIX = .exe
LIB.SONAME = $(NAME).dll LIB.SONAME = lib$(NAME).dll
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
LIB.SHARED = $(NAME).dll LIB.SHARED = $(NAME).dll
LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO) LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO)
...@@ -13,7 +13,7 @@ LDFLAGS.EXTRA = -L/mingw/lib ...@@ -13,7 +13,7 @@ LDFLAGS.EXTRA = -L/mingw/lib
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
BIN.SUFFIX = .exe BIN.SUFFIX = .exe
LIB.SONAME = $(NAME).dll LIB.SONAME = lib$(NAME).dll
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
LIB.SHARED = $(NAME).dll LIB.SHARED = $(NAME).dll
LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO) LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment