From 94fe304adf3f688e8e97b8934bd37229b8ecb8f9 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Wed, 29 Oct 2003 03:41:36 +0000 Subject: "" svn path=/trunk/; revision=1150 --- externals/grill/dyn/config-pd-msvc.txt | 5 +++-- externals/grill/dyn/makefile.pd-msvc | 4 ++-- externals/grill/vst/src/VstHost.cpp | 4 ++-- externals/grill/vst/vst.vcproj | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/externals/grill/dyn/config-pd-msvc.txt b/externals/grill/dyn/config-pd-msvc.txt index 67c9a0cb..e163ffd3 100644 --- a/externals/grill/dyn/config-pd-msvc.txt +++ b/externals/grill/dyn/config-pd-msvc.txt @@ -11,8 +11,9 @@ PDPATH=c:\programme\audio\pd # where do the flext libraries reside? FLEXTPATH=$(PDPATH)\flext -# where is MS VC++? -MSVCPATH=c:\programme\prog\microsoft visual studio\VC98 +# where is MS VC++ installed? +# if the VC++ command prompt is used VCINSTALLDIR should already be set correctly +MSVCDIR=$(VCINSTALLDIR) # where should the external be built? OUTPATH=pd-msvc diff --git a/externals/grill/dyn/makefile.pd-msvc b/externals/grill/dyn/makefile.pd-msvc index 17c6b0eb..94561b3e 100644 --- a/externals/grill/dyn/makefile.pd-msvc +++ b/externals/grill/dyn/makefile.pd-msvc @@ -5,7 +5,7 @@ # WARRANTIES, see the file, "license.txt," in this distribution. # # -# Makefile for MSVC++ 6 +# Makefile for MSVC++ 7 # # usage: # to build run "make -f makefile.pd-msvc" @@ -21,7 +21,7 @@ LIBS=pd.lib flext-pdwin.lib # compiler definitions and flags DEFS=/DFLEXT_SYS=2 -CFLAGS=/GR- /GX- /GD /G6 /Ox /ML +CFLAGS=/EHsc /G6 /Ox /ML # the rest can stay untouched # ---------------------------------------------- diff --git a/externals/grill/vst/src/VstHost.cpp b/externals/grill/vst/src/VstHost.cpp index 57a67c52..ee775cfc 100644 --- a/externals/grill/vst/src/VstHost.cpp +++ b/externals/grill/vst/src/VstHost.cpp @@ -338,13 +338,13 @@ long VSTPlugin::Master(AEffect *effect, long opcode, long index, long value, voi else return 1; } return 0; // inquire if an input or output is beeing connected; - +/* case audioMasterWantMidi: return 0; case audioMasterProcessEvents: return 0; // Support of vst events to host is not available - +*/ case audioMasterGetTime: memset(&_timeInfo, 0, sizeof(_timeInfo)); _timeInfo.samplePos = 0; diff --git a/externals/grill/vst/vst.vcproj b/externals/grill/vst/vst.vcproj index b3082cf7..36d8f3c2 100644 --- a/externals/grill/vst/vst.vcproj +++ b/externals/grill/vst/vst.vcproj @@ -84,7 +84,7 @@ OutputDirectory=".\pd-msvc/d" IntermediateDirectory=".\pd-msvc/d" ConfigurationType="2" - UseOfMFC="2" + UseOfMFC="1" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2">