Changeset 24606

Timestamp:

02/27/20 11:02:38 (5 years ago)

Author:

jdquinn

Message:

CHG: More Triangle config changes to support Windows build

Location:

issm/trunk-jpl/externalpackages/triangle/configs

Files:

• linux/configure.make (modified) (1 diff)
• mac/configure.make (modified) (1 diff)
• makefile (modified) (3 diffs)
• windows/configure.make (modified) (1 diff)

issm/trunk-jpl/externalpackages/triangle/configs/linux/configure.make

@@ -2 +2 @@
 CSWITCHES= $(CFLAGS) -DNO_TIMER -fpic
 TRILIBDEFS= -DTRILIBRARY
+STATIC_LIB_EXT=a
 SHARED_LIB_EXT=so
 OBJ_EXT=o

issm/trunk-jpl/externalpackages/triangle/configs/mac/configure.make

@@ -2 +2 @@
 CSWITCHES= $(CFLAGS) -DNO_TIMER -fpic
 TRILIBDEFS= -DTRILIBRARY
+STATIC_LIB_EXT=a
 SHARED_LIB_EXT=dylib
 OBJ_EXT=o

issm/trunk-jpl/externalpackages/triangle/configs/makefile

@@ -1 @@
-################################################################################
-# Adaptation of Triangle makefile to compile only the triangle.c source file
-################################################################################
 include ./configure.make
 
@@ -19 +16 @@
 OBJECTS=triangle.$(OBJ_EXT)
 
-all: libtriangle.a libtriangle.$(SHARED_LIB_EXT)
+all: libtriangle.$(STATIC_LIB_EXT) libtriangle.$(SHARED_LIB_EXT)
 
 objects: $(OBJECTS)
@@ -25 +22 @@
 shared: libtriangle.$(SHARED_LIB_EXT)
 
-static: libtriangle.a
+static: libtriangle.$(STATIC_LIB_EXT)
 
-triangle.o: $(SOURCES)
+triangle.$(OBJ_EXT): $(SOURCES)
         $(CC) $(CSWITCHES) $(TRILIBDEFS) -c triangle.c
 
-libtriangle.a: $(OBJECTS)
+libtriangle.$(STATIC_LIB_EXT): $(OBJECTS)
         $(AR) cr $@ $(OBJECTS)
         $(RANLIB) $@
+
+libtriangle.dll: $(SOURCES)
+        $(CC) $(CSWITCHES) $(TRILIBDEFS) -shared -o $@ triangle.c
 
 libtriangle.dylib: $(OBJECTS)

issm/trunk-jpl/externalpackages/triangle/configs/windows/configure.make

@@ -1 +1 @@
 CC=cl
-CSWITCHES = $(CFLAGS) -DNO_TIMER
+CSWITCHES= $(CFLAGS) -DNO_TIMER
 TRILIBDEFS= -DTRILIBRARY
+STATIC_LIB_EXT=lib
 SHARED_LIB_EXT=dll
 OBJ_EXT=obj