summaryrefslogtreecommitdiff
path: root/src/glut/glx/Makefile
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-07-25 22:59:58 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-07-25 22:59:58 +0000
commit8dcc6736aba672916bd4bc70a964c30bb11eeafa (patch)
tree799d6ea38b64d65bd41e8b5e025678eb1e822b01 /src/glut/glx/Makefile
parente9dbe58b8b541d0abb9be9e1000a63776abe678c (diff)
Added -linker option to mklib, used to specify a particular program for
linking, if relevant. Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
Diffstat (limited to 'src/glut/glx/Makefile')
-rw-r--r--src/glut/glx/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 2b7180493f..e345c8df40 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -90,9 +90,9 @@ default: $(LIB_DIR)/$(GLUT_LIB_NAME)
# Make the library
$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
- CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GLUT_LIB) \
- -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
- -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+ $(TOP)/bin/mklib -o $(GLUT_LIB) -linker $(CC) \
+ -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
+ $(MKLIB_OPTIONS) -install $(LIB_DIR) \
$(GLUT_LIB_DEPS) $(OBJECTS)