From 78f5eb22f0e954a290366d8429a4f74498971c06 Mon Sep 17 00:00:00 2001
From: Jonathan Wilkes <jon.w.wilkes@gmail.com>
Date: Thu, 11 May 2017 17:43:44 -0400
Subject: [PATCH] remove lpthreadGC2 flag and gfsm to get things building on
Windows
---
externals/moocow/common/m4/ax_pd_external.m4 | 2 +-
externals/moocow/deque/configure | 2 +-
externals/moocow/extended/Makefile | 3 +--
externals/moocow/flite/configure | 2 +-
externals/moocow/gfsm/configure | 2 +-
externals/moocow/locale/configure | 2 +-
externals/moocow/pdstring/configure | 2 +-
externals/moocow/readdir/configure | 2 +-
externals/moocow/sprinkler/configure | 2 +-
externals/moocow/weightmap/configure | 2 +-
10 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/externals/moocow/common/m4/ax_pd_external.m4 b/externals/moocow/common/m4/ax_pd_external.m4
index 7b13262eb..e30a48d9f 100644
--- a/externals/moocow/common/m4/ax_pd_external.m4
+++ b/externals/moocow/common/m4/ax_pd_external.m4
@@ -352,7 +352,7 @@ AC_DEFUN([AX_PD_EXTERNAL],
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
diff --git a/externals/moocow/deque/configure b/externals/moocow/deque/configure
index ec2366a3a..f9ac07dd1 100755
--- a/externals/moocow/deque/configure
+++ b/externals/moocow/deque/configure
@@ -3858,7 +3858,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
diff --git a/externals/moocow/extended/Makefile b/externals/moocow/extended/Makefile
index 7de8cbf8e..c5c7878c3 100644
--- a/externals/moocow/extended/Makefile
+++ b/externals/moocow/extended/Makefile
@@ -15,8 +15,7 @@ SUBDIRS = \
deque \
readdir \
weightmap \
- sprinkler \
- gfsm
+ sprinkler
##-- 'pdstring' and 'sprinkler' are already in 'flatspace' ... should they be moved here?
## -> 2008-08: removed any2string,string2any,pdstring from flatspace
diff --git a/externals/moocow/flite/configure b/externals/moocow/flite/configure
index f15bd2ab2..c7ba9b268 100755
--- a/externals/moocow/flite/configure
+++ b/externals/moocow/flite/configure
@@ -4398,7 +4398,7 @@ $as_echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
diff --git a/externals/moocow/gfsm/configure b/externals/moocow/gfsm/configure
index ec572b87d..6e00fd2f5 100755
--- a/externals/moocow/gfsm/configure
+++ b/externals/moocow/gfsm/configure
@@ -20520,7 +20520,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
diff --git a/externals/moocow/locale/configure b/externals/moocow/locale/configure
index 896410510..5b813cf01 100755
--- a/externals/moocow/locale/configure
+++ b/externals/moocow/locale/configure
@@ -3858,7 +3858,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
diff --git a/externals/moocow/pdstring/configure b/externals/moocow/pdstring/configure
index 8378ac101..9f3722c92 100755
--- a/externals/moocow/pdstring/configure
+++ b/externals/moocow/pdstring/configure
@@ -3861,7 +3861,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
diff --git a/externals/moocow/readdir/configure b/externals/moocow/readdir/configure
index da49a2e02..79ec05612 100755
--- a/externals/moocow/readdir/configure
+++ b/externals/moocow/readdir/configure
@@ -3860,7 +3860,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
diff --git a/externals/moocow/sprinkler/configure b/externals/moocow/sprinkler/configure
index ad69bf5ba..3efc47fca 100755
--- a/externals/moocow/sprinkler/configure
+++ b/externals/moocow/sprinkler/configure
@@ -3868,7 +3868,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
diff --git a/externals/moocow/weightmap/configure b/externals/moocow/weightmap/configure
index e91d9afa1..678ea59c6 100755
--- a/externals/moocow/weightmap/configure
+++ b/externals/moocow/weightmap/configure
@@ -3860,7 +3860,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >
"
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT"
- LIBS="$LIBS -lpd -lwsock32 -lpthreadGC2 -lkernel32 -luser32 -lgdi32 -lregex"
+ LIBS="$LIBS -lpd -lwsock32 -lkernel32 -luser32 -lgdi32 -lregex"
if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2"
--
GitLab