"Mandalemula, Rajesh" <Raj...@de...> writes:
> +# Make the exports file with the mangled or unmangled names per $CFLAGS
> +glu.exports: glu.exports.in
Where does glu.exports.in come from? It is not in the tree. Did you
forget to 'git add' it?
>From the output, it looks like it should be
#ifdef USE_MGL_NAMESPACE
mgluBeginCurve
mgluBeginPolygon
...
#else
gluBeginCurve
gluBeginPolygon
...
#endif
if so, then it looks like it would fix 26335 as well. Could the mklib
be adjusted to just use glu.exports on Darwin as well, then, and then
glu.exports.darwin be removed from the tree?
Thanks,
-tom
> + @if [ "`expr "$(CC)" : ".*gcc"`" -ne 0 ] ; then \
> + $(CC) -E -I $(TOP)/include/GL $(CFLAGS) - < $< | \
> + awk '/^[^#]+/ {print}' > $@; \
> + else \
> + $(CC) -E -I $(TOP)/include/GL $(CFLAGS) $< | \
> + awk '/^[^#]+/ {print}' > $@; \
> + fi
> +
> # Make the library:
> -$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
> +$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) glu.exports
> $(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
> -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) =
> \
> -cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
> @@ -144,6 +154,7 @@
>
>
> clean:
> + -rm -f glu.exports
> -rm -f *.o */*.o */*/*.o
> -rm -f *.lo */*.lo */*/*.lo
> -rm -f *.la */*.la */*/*.la
|
