Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv455
Modified Files:
Makefile.in FFmpeg.h
Log Message:
Add more setting of __STDC_CONSTANT_MACROS and checking for mis-inclusion of
stdint.h, in the hope that this may fix the compile issues on Mac OS X with
ffmpeg enabled.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Makefile.in,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- Makefile.in 9 Nov 2008 19:49:11 -0000 1.148
+++ Makefile.in 18 Nov 2008 22:38:53 -0000 1.149
@@ -38,7 +38,7 @@
override CXXFLAGS += @CXXFLAGS@
# CPPFLAGS are for both C and C++.
-override CPPFLAGS += -fno-strict-aliasing -I$(srcdir)/include -I.
-DLIBDIR=\"$(libdir)\" @CPPFLAGS@
+override CPPFLAGS += -fno-strict-aliasing -I$(srcdir)/include -I.
-DLIBDIR=\"$(libdir)\" -D__STDC_CONSTANT_MACROS @CPPFLAGS@
# LDFLAGS are for linking. BUILD_LDFLAGS are not valid during configure because
# they reference libs that haven't been built yet
Index: FFmpeg.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FFmpeg.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- FFmpeg.h 18 Nov 2008 22:13:41 -0000 1.31
+++ FFmpeg.h 18 Nov 2008 22:38:53 -0000 1.32
@@ -30,14 +30,21 @@
* Audacity.h */
#if defined(USE_FFMPEG)
- extern "C" {
- #ifdef _STDINT_H
+ extern "C" {
+ #ifdef _STDINT_H
/* stdint.h has already been included. That's likely to break ffmpeg headers
- * as described above so we issue a warning */
- #warning "stdint.h included before ffmpeg headers, this may well not
compile"
- #endif
+ * as described above so we issue a warning */
+ #warning "stdint.h included before ffmpeg headers, this might not compile"
+ #endif
+ #ifdef _STDINT_H_
+ /* as above but for Mac (mainly as a debugging tool) */
+ #warning "stdint.h included before ffmpeg headers, this might not compile"
+ #endif
+
#if !defined(__STDC_CONSTANT_MACROS)
#define __STDC_CONSTANT_MACROS
+ /* also defined on the compiler command line for autotools builds, so
+ * should only be here for windows builders */
#endif
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
