aboutsummaryrefslogtreecommitdiff
path: root/externals/grill
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2005-08-01 11:51:30 +0000
committerThomas Grill <xovo@users.sourceforge.net>2005-08-01 11:51:30 +0000
commit367019514f0f39144c17878213cf92a9de991d27 (patch)
tree1e63b768d762b4e0cd44c90df00265517d00b784 /externals/grill
parent912aaf0ae7b87c2f01e1be2734447deb99ba6358 (diff)
*** empty log message ***
svn path=/trunk/; revision=3398
Diffstat (limited to 'externals/grill')
-rw-r--r--externals/grill/flext/build.txt6
-rw-r--r--externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc2
-rw-r--r--externals/grill/flext/buildsys/win/gnumake-mingw.inc2
-rw-r--r--externals/grill/flext/buildsys/win/max/gnumake-mingw.inc4
4 files changed, 9 insertions, 5 deletions
diff --git a/externals/grill/flext/build.txt b/externals/grill/flext/build.txt
index 74311f45..fdb24bc8 100644
--- a/externals/grill/flext/build.txt
+++ b/externals/grill/flext/build.txt
@@ -47,6 +47,8 @@ pd msvc, using nmake
pd cygwin, using gnumake
pd mingw, using gnumake (from the CMD prompt, not msys!)
max msvc, using nmake
+max cygwin, using gnumake
+max mingw, using gnumake (from the CMD prompt, not msys!)
pd bcc, using bmake
under Linux or MacOSX:
@@ -163,8 +165,8 @@ win-pd-bcc, single/multi/shared
win-pd-mingw, single/multi/shared (from CMD prompt, not MSYS)
win-pd-cygwin, single/multi/shared
win-max-msvc, single/multi/shared
-win-max-mingw, --- NOT WORKING (linker problems) ----
-win-max-cygwin, --- NOT WORKING (linker problems) ----
+win-max-cygwin, single/multi/shared
+win-max-mingw, single/multi/shared
mac-pd-gcc, single/multi/shared
diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc b/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc
index 8044d19b..3a998a5d 100644
--- a/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc
+++ b/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc
@@ -32,7 +32,7 @@ $(TARGETPATH)/%.o : $(SRCDIR)/%.c
$(TARGET) :: $(TARGETPATH)
$(TARGET) :: $(COBJS) $(CPPOBJS)
- $(CXX) $(LDFLAGS) $(subst \,/,$(LIBPATH)) -o $(subst /,\,$@) $(subst /,\,$(COBJS) $(CPPOBJS) $(LIBS))
+ $(CXX) $(LDFLAGS) $(subst \,/,$(LIBPATH)) -o $(subst /,\,$@) $(subst /,\,$(COBJS) $(CPPOBJS) $(LIBS) $(SYSLIBS))
-strip --strip-unneeded $@
##############################################
diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw.inc b/externals/grill/flext/buildsys/win/gnumake-mingw.inc
index 5f9e3633..82ee4381 100644
--- a/externals/grill/flext/buildsys/win/gnumake-mingw.inc
+++ b/externals/grill/flext/buildsys/win/gnumake-mingw.inc
@@ -7,7 +7,7 @@ TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT)
##############################################
CFLAGS += -mms-bitfields -mno-cygwin
-LDFLAGS += -shared -mno-cygwin
+LDFLAGS += -shared -mno-cygwin
##############################################
diff --git a/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc b/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc
index 26e234c8..28685d7e 100644
--- a/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc
+++ b/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc
@@ -2,9 +2,11 @@ DEFS += -DFLEXT_SYS=1
# fpack-struct should align to 2 bytes... can't specify that...
CFLAGS += -DWINVER=0x0501 -D_WIN32_WINNT=0x501
+# suppress multiple symbol errors
+LDFLAGS += -Wl,--allow-multiple-definition
INCPATH += -I$(MAXSDKPATH)/max-includes -I$(MAXSDKPATH)/msp-includes
LIBPATH += -L$(MAXSDKPATH)/max-includes -L$(MAXSDKPATH)/msp-includes
# these are both in MAXSDKPATH
-LIBS += -lMaxAPI -lMaxAudio
+SYSLIBS += -lMaxAPI -lMaxAudio