diff options
| author | Thomas Grill <xovo@users.sourceforge.net> | 2006-08-11 16:44:48 +0000 |
|---|---|---|
| committer | Thomas Grill <xovo@users.sourceforge.net> | 2006-08-11 16:44:48 +0000 |
| commit | 9cba3b8fccf2f9d680d5ef7847689fe9cda2e294 (patch) | |
| tree | 6cbff4009ceefd4a90c2b5f54a60768192ce0c1f | |
| parent | 95e8869619a68d33303ca1b6394b8856c1867c7f (diff) | |
fix dynamic linker problem, not using flat_namespace
OSX switch to dynamic_lookup, 10.3 only but much cleaner
cosmetic changes to calm the compiler
use normal assertion
svn path=/trunk/; revision=5564
| -rw-r--r-- | externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc | 3 | ||||
| -rw-r--r-- | externals/grill/flext/source/flstdc.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc index 2c5e364a..fd63e346 100644 --- a/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc +++ b/externals/grill/flext/buildsys/mac/pd/gnumake-gcc-ext.inc @@ -1,6 +1,7 @@ EXT=pd_darwin -LDFLAGS += -bundle -bundle_loader $(PDBIN) +#LDFLAGS += -bundle -bundle_loader $(PDBIN) +LDFLAGS += -dylib -undefined dynamic_lookup TARGET=$(TARGETPATH)/$(TARGETNAME) INSTTARGET=$(TARGET) diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h index b993dd96..13ac271c 100644 --- a/externals/grill/flext/source/flstdc.h +++ b/externals/grill/flext/source/flstdc.h @@ -28,6 +28,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #ifdef _MSC_VER #include <crtdbg.h> +#else +#include <assert.h> #endif // PD stuff @@ -255,7 +257,8 @@ typedef t_symbol *t_symptr; #define FLEXT_WARN(str) _CrtDbgReport(_CRT_WARN,__FILE__,__LINE__,"flext",NULL) #define FLEXT_ERROR(str) _CrtDbgReport(_CRT_ERROR,__FILE__,__LINE__,"flext",NULL) #else -#define FLEXT_ASSERT(b) do { if(!(b)) error("Assertion failed: " #b " - in " __FILE__ " line %i",(int)__LINE__); } while(false) +#define FLEXT_ASSERT(b) assert(b) +//#define FLEXT_ASSERT(b) do { if(!(b)) error("Assertion failed: " #b " - in " __FILE__ " line %i",(int)__LINE__); } while(false) #define FLEXT_WARN(str) error("Warning: in " __FILE__ " line %i",(int)__LINE__) #define FLEXT_ERROR(str) error("Error: in " __FILE__ " line %i",(int)__LINE__) #endif |