From 367019514f0f39144c17878213cf92a9de991d27 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Mon, 1 Aug 2005 11:51:30 +0000 Subject: *** empty log message *** svn path=/trunk/; revision=3398 --- externals/grill/flext/build.txt | 6 ++++-- externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc | 2 +- externals/grill/flext/buildsys/win/gnumake-mingw.inc | 2 +- externals/grill/flext/buildsys/win/max/gnumake-mingw.inc | 4 +++- 4 files changed, 9 insertions(+), 5 deletions(-) (limited to 'externals/grill/flext') 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 -- cgit v1.2.1