Commit 78f5eb22 authored by Jonathan Wilkes's avatar Jonathan Wilkes

remove lpthreadGC2 flag and gfsm to get things building on Windows

parent 8268ab80
...@@ -352,7 +352,7 @@ AC_DEFUN([AX_PD_EXTERNAL], ...@@ -352,7 +352,7 @@ AC_DEFUN([AX_PD_EXTERNAL],
" "
PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
...@@ -3858,7 +3858,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > ...@@ -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_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
...@@ -15,8 +15,7 @@ SUBDIRS = \ ...@@ -15,8 +15,7 @@ SUBDIRS = \
deque \ deque \
readdir \ readdir \
weightmap \ weightmap \
sprinkler \ sprinkler
gfsm
##-- 'pdstring' and 'sprinkler' are already in 'flatspace' ... should they be moved here? ##-- 'pdstring' and 'sprinkler' are already in 'flatspace' ... should they be moved here?
## -> 2008-08: removed any2string,string2any,pdstring from flatspace ## -> 2008-08: removed any2string,string2any,pdstring from flatspace
......
...@@ -4398,7 +4398,7 @@ $as_echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\ ...@@ -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_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
...@@ -20520,7 +20520,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > ...@@ -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_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
...@@ -3858,7 +3858,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > ...@@ -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_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
...@@ -3861,7 +3861,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > ...@@ -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_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
...@@ -3860,7 +3860,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > ...@@ -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_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
...@@ -3868,7 +3868,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > ...@@ -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_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
...@@ -3860,7 +3860,7 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > ...@@ -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_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj"
PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" 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 if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
##-- only set OFLAGS if user CFLAGS are empty ##-- only set OFLAGS if user CFLAGS are empty
PDEXT_OFLAGS="-O2" PDEXT_OFLAGS="-O2"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment