Added extern "C" around winsock and moved it before "wx/msw/private.h"

[wxWidgets.git] / contrib / src / ogl / Makefile.in

diff --git a/contrib/src/ogl/Makefile.in b/contrib/src/ogl/Makefile.in
index 1edfe19d0f6240963c12af6bbc4bf4b83426c426..64f08fbfadf693bcc33ffc8190c6738d8fd244a8 100644 (file)
--- a/contrib/src/ogl/Makefile.in
+++ b/contrib/src/ogl/Makefile.in
@@ -1,13 +1,22 @@
 #
 
 #
 

-top_builddir = ../..
+top_srcdir = @top_srcdir@
+top_builddir = ../../..

 
 

-VPATH= $(top_srcdir)/ogl
+TARGET_LIBNAME=libogl

 
 

-LIBTARGET=$(top_builddir)/lib/libogl
+LIBVERSION_CURRENT=1
+LIBVERSION_REVISION=0
+LIBVERSION_AGE=0

 
 OBJECTS=basic.o   bmpshape.o  composit.o  divided.o  lines.o    misc.o \
         basic2.o  canvas.o    constrnt.o  drawn.o    mfutils.o  ogldiag.o
 
 
 OBJECTS=basic.o   bmpshape.o  composit.o  divided.o  lines.o    misc.o \
         basic2.o  canvas.o    constrnt.o  drawn.o    mfutils.o  ogldiag.o
 

+# the comment at the end of the next line is needed because otherwise autoconf
+# would remove this line completely - it contains a built-in hack to remove
+# any VPATH assignment not containing ':'
+VPATH = :$(top_srcdir)/src/ogl # ':' for autoconf
+
+APPEXTRADEFS=-I$(top_srcdir)/include

 
 include $(top_builddir)/src/makelib.env
 
 include $(top_builddir)/src/makelib.env