From 2a58dfbcf6eb4fd72d19f46067d841a4aab873bf Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Tue, 19 Jul 2005 23:08:33 +0000 Subject: more corrections to cygwin... seems to work now for Max/MSP as well avoid problems with paths containing spaces enhancements for cygwin builds (working for PD now, but not for Max) svn path=/trunk/; revision=3362 --- .../flext/buildsys/win/gnumake-cygwin-ext.inc | 4 +- .../flext/buildsys/win/gnumake-cygwin-flext.inc | 6 +-- .../grill/flext/buildsys/win/gnumake-cygwin.inc | 4 +- .../grill/flext/buildsys/win/gnumake-mingw.inc | 4 +- .../grill/flext/buildsys/win/max/config-cygwin.def | 51 ++++++++++++++++++++++ .../flext/buildsys/win/max/gnumake-cygwin-ext.inc | 1 + .../buildsys/win/max/gnumake-cygwin-flext.inc | 6 +++ .../flext/buildsys/win/max/gnumake-cygwin.inc | 10 +++++ .../grill/flext/buildsys/win/max/gnumake-mingw.inc | 4 +- .../grill/flext/buildsys/win/max/nmake-msvc.inc | 2 +- .../grill/flext/buildsys/win/pd/config-cygwin.def | 2 +- .../grill/flext/buildsys/win/pd/gnumake-cygwin.inc | 7 +-- 12 files changed, 83 insertions(+), 18 deletions(-) create mode 100644 externals/grill/flext/buildsys/win/max/config-cygwin.def create mode 100644 externals/grill/flext/buildsys/win/max/gnumake-cygwin-ext.inc create mode 100644 externals/grill/flext/buildsys/win/max/gnumake-cygwin-flext.inc create mode 100644 externals/grill/flext/buildsys/win/max/gnumake-cygwin.inc (limited to 'externals/grill/flext/buildsys/win') diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc index 91eff1ed..141d5093 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin-ext.inc @@ -24,7 +24,7 @@ $(TARGETPATH)/%.o : $(SRCDIR)/%.c $(TARGET) :: $(TARGETPATH) $(TARGET) :: $(COBJS) $(CPPOBJS) - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) $(SYSLIBS) strip --strip-unneeded $@ chmod 755 $@ @@ -36,7 +36,7 @@ _clean_: ############################################## $(INSTPATH): - -mkdir -p $@ + -mkdir -p $(INSTPATH) _install_: $(INSTPATH) install $(TARGET) $(INSTPATH) diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc index ec55d6b8..e8940a5d 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin-flext.inc @@ -21,7 +21,7 @@ $(TARGET) :: $(TARGETPATH) $(TARGET) :: $(COBJS) $(CPPOBJS) ifdef SHARED - $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) + $(CXX) $(LDFLAGS) $(LIBPATH) -o $@ $(COBJS) $(CPPOBJS) $(LIBS) $(SYSLIBS) chmod 755 $@ strip --strip-unneeded $@ else @@ -42,10 +42,10 @@ FLEXTLIBINST=$(FLEXTLIB) endif $(FLEXTINC): - -mkdir -p $@ + -mkdir -p $(FLEXTINC) $(FLEXTLIBINST): - -mkdir -p $@ + -mkdir -p $(FLEXTLIBINST) _install_: $(FLEXTINC) $(FLEXTLIBINST) install $(TARGET) $(FLEXTLIBINST) diff --git a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc index e98de396..48155ff1 100644 --- a/externals/grill/flext/buildsys/win/gnumake-cygwin.inc +++ b/externals/grill/flext/buildsys/win/gnumake-cygwin.inc @@ -6,8 +6,8 @@ TARGET=$(TARGETPATH)/$(OUTNAME).$(EXT) ############################################## -CFLAGS += -LDFLAGS += -shared +CFLAGS += -mno-cygwin +LDFLAGS += -shared -mno-cygwin ############################################## diff --git a/externals/grill/flext/buildsys/win/gnumake-mingw.inc b/externals/grill/flext/buildsys/win/gnumake-mingw.inc index 063bc058..5f9e3633 100644 --- a/externals/grill/flext/buildsys/win/gnumake-mingw.inc +++ b/externals/grill/flext/buildsys/win/gnumake-mingw.inc @@ -6,8 +6,8 @@ TARGET=$(TARGETPATH)\$(OUTNAME).$(EXT) ############################################## -CFLAGS += -mms-bitfields -LDFLAGS += -shared +CFLAGS += -mms-bitfields -mno-cygwin +LDFLAGS += -shared -mno-cygwin ############################################## diff --git a/externals/grill/flext/buildsys/win/max/config-cygwin.def b/externals/grill/flext/buildsys/win/max/config-cygwin.def new file mode 100644 index 00000000..a4562a73 --- /dev/null +++ b/externals/grill/flext/buildsys/win/max/config-cygwin.def @@ -0,0 +1,51 @@ +# where is the Max/MSP application? +MAXAPPPATH=/cygdrive/c/program\ files/MaxMSP\ 4.5 + +# where are the Max/MSP common files? +MAXCOMPATH=/cygdrive/c/program\ files/common\ files/Cycling\ \'74 + + +# where are the Max/MSP SDK header files? +# you should have the latest version! +MAXSDKPATH=$(MAXAPPPATH)/maxmspsdk_win/4.5\ headers/c74support + +############################################################### + +############################################################### + +# where do/should the flext headers reside/be built? +FLEXTINC=$(MAXCOMPATH)/flext + +# where do/should the flext static libraries reside/be built? +FLEXTLIB=$(FLEXTINC) + +# where do/should the flext shared libraries reside/be built? +# (a good place is the MaxMSP program folder) +FLEXTSHLIB=$(MAXAPPPATH) + +############################################################### + +# where should the external be built? +# (path for temporary files) +OUTPATH=max-cygwin + +# where should the external be installed? +INSTPATH=$(MAXCOMPATH)/externals/flext + +# where should the initialization files be installed? +INITPATH=$(MAXCOMPATH)/init + +# where should the help files be installed? +HELPPATH=$(MAXAPPPATH)/max-help/flext + +############################################################### + +# user defined compiler flags +# (check if they match your system!) +UFLAGS=-msse -mfpmath=sse -ffast-math + +# user defined optimization flags +# (check if they match your system!) +OFLAGS=-O3 +# optimizations for Pentium 4 +OFLAGS+=-march=pentium4 diff --git a/externals/grill/flext/buildsys/win/max/gnumake-cygwin-ext.inc b/externals/grill/flext/buildsys/win/max/gnumake-cygwin-ext.inc new file mode 100644 index 00000000..5df7e2f2 --- /dev/null +++ b/externals/grill/flext/buildsys/win/max/gnumake-cygwin-ext.inc @@ -0,0 +1 @@ +EXT=mxe diff --git a/externals/grill/flext/buildsys/win/max/gnumake-cygwin-flext.inc b/externals/grill/flext/buildsys/win/max/gnumake-cygwin-flext.inc new file mode 100644 index 00000000..60cd079a --- /dev/null +++ b/externals/grill/flext/buildsys/win/max/gnumake-cygwin-flext.inc @@ -0,0 +1,6 @@ +ifdef SHARED +EXT=dll +else +EXT=a +endif + diff --git a/externals/grill/flext/buildsys/win/max/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/max/gnumake-cygwin.inc new file mode 100644 index 00000000..743d0e79 --- /dev/null +++ b/externals/grill/flext/buildsys/win/max/gnumake-cygwin.inc @@ -0,0 +1,10 @@ +DEFS += -DFLEXT_SYS=1 + +# fpack-struct should align to 2 bytes... can't specify that... +CFLAGS += -DWINVER=0x0501 -D_WIN32_WINNT=0x501 + +INCPATH += -I$(MAXSDKPATH)/max-includes -I$(MAXSDKPATH)/msp-includes +LIBPATH += -L$(MAXSDKPATH)/max-includes -L$(MAXSDKPATH)/msp-includes + +# these are both in MAXSDKPATH +SYSLIBS += -lMaxAPI -lMaxAudio diff --git a/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc b/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc index ccf14536..26e234c8 100644 --- a/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc +++ b/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc @@ -1,10 +1,10 @@ DEFS += -DFLEXT_SYS=1 # fpack-struct should align to 2 bytes... can't specify that... -CFLAGS += -fpack-struct -D_WIN32_WINNT=0x501 +CFLAGS += -DWINVER=0x0501 -D_WIN32_WINNT=0x501 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 +LIBS += -lMaxAPI -lMaxAudio diff --git a/externals/grill/flext/buildsys/win/max/nmake-msvc.inc b/externals/grill/flext/buildsys/win/max/nmake-msvc.inc index 94cdc32e..c78b74aa 100644 --- a/externals/grill/flext/buildsys/win/max/nmake-msvc.inc +++ b/externals/grill/flext/buildsys/win/max/nmake-msvc.inc @@ -1,5 +1,5 @@ DEFS=$(DEFS) /DFLEXT_SYS=1 -CFLAGS=$(CFLAGS) /Zp2 /D_WIN32_WINNT=0x501 +CFLAGS=$(CFLAGS) /Zp2 /DWINVER=0x0501 /D_WIN32_WINNT=0x501 INCPATH=$(INCPATH) /I$(MAXSDKPATH)\max-includes /I$(MAXSDKPATH)\msp-includes LIBPATH=$(LIBPATH) /LIBPATH:$(MAXSDKPATH)\max-includes /LIBPATH:$(MAXSDKPATH)\msp-includes diff --git a/externals/grill/flext/buildsys/win/pd/config-cygwin.def b/externals/grill/flext/buildsys/win/pd/config-cygwin.def index d7c319e0..6c35151a 100644 --- a/externals/grill/flext/buildsys/win/pd/config-cygwin.def +++ b/externals/grill/flext/buildsys/win/pd/config-cygwin.def @@ -1,6 +1,6 @@ # where is the PD installation? # (this should point to the main folder, which has a "src" subfolder) -PDPATH=/cygdrive/c/programme/pd +PDPATH=/cygdrive/c/program files/pd ############################################################### diff --git a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc index 017635ae..7ddba80b 100644 --- a/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc +++ b/externals/grill/flext/buildsys/win/pd/gnumake-cygwin.inc @@ -2,8 +2,5 @@ DEFS += -DFLEXT_SYS=2 INCPATH += -I$(PDPATH)/src -# trick PD in a way that only the cygwin pthread headers are used -CFLAGS += -include /usr/include/sched.h -include /usr/include/pthread.h -DPTHREAD_H - -LIBS += $(PDPATH)/bin/pd.dll -#LIBS += $(PDPATH)/bin/pthreadVC.dll +LIBS += $(PDPATH)/bin/pthreadVC.dll +SYSLIBS += $(PDPATH)/bin/pd.dll -- cgit v1.2.1