Mercurial > forge

diff main/database/src/Makefile.in @ 12317:67adec29dee0 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Applied Windows compatibility patch for John Donoghue.
author i7tiol
date Wed, 15 Jan 2014 20:55:07 +0000
parents b9544a96bc8d
children 1af86934c14e
line wrap: on
line diff
--- a/main/database/src/Makefile.in	Wed Jan 15 20:37:42 2014 +0000
+++ b/main/database/src/Makefile.in	Wed Jan 15 20:55:07 2014 +0000
@@ -1,6 +1,11 @@
 # We rely on g++ features, configure assures CXX=g++.
 CXX := @CXX@
 
+EXTRALIBS = 
+ifeq ($(OS),Windows_NT)
+  EXTRALIBS = -lws2_32
+endif
+
 ifndef CXXFLAGS
 CXXFLAGS_NSA := "-g -O2 -fno-strict-aliasing"
 else
@@ -12,7 +17,7 @@
            pq_update_types.o pq_lo.o pq_conninfo.o __pq_internal_exit__.o
 
 pq_interface.oct: $(OBJECTS)
-	@MKOCTFILE@ -o pq_interface.oct -L`@PG_CONFIG@ --libdir` -lpq $(OBJECTS)
+	@MKOCTFILE@ -o pq_interface.oct -L`@PG_CONFIG@ --libdir` -lpq $(OBJECTS) $(EXTRALIBS)
 
 converters.o: converters.cc converters.h wrap_endian.h
 	CXX=$(CXX) CXXFLAGS=$(CXXFLAGS_NSA) @MKOCTFILE@ -I`@PG_CONFIG@ --includedir` -c converters.cc