diff options
| author | Fredrik Orderud <fredrik.orderud@idi.ntnu.no> | 2005-12-12 00:48:42 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-12-12 00:48:42 +0000 |
| commit | 765c34406074b56c85966b4813383014ce8b7d0a (patch) | |
| tree | d1d29d42f5b9ace81649e3051f12ecdd8abf6878 | |
| parent | 4d1ee6f9399777eadd0ebaec9281f6a39e738b29 (diff) | |
| download | ffmpeg-765c34406074b56c85966b4813383014ce8b7d0a.tar.gz | |
Define EMULATE_INTTYPES for all windows-systems, except Cygwin and MinGW
to simplify usage on Windows.
patch by Fredrik Orderud fredrik - . - orderud - @ - idi - . - ntnu - . - no
Originally committed as revision 4736 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/ffmpeg-doc.texi | 9 | ||||
| -rw-r--r-- | libavutil/common.h | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index 2b388ee889..d83c672ea5 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -1015,14 +1015,7 @@ from the tree view, then add the files @file{avformat.lib}, Dependencies". Note that the names of the libraries have to be separated using spaces. -@item Now, select "C/C++ / Preprocessor" from the tree view. Select "Debug" -in the "Configuration" combo box. Add @code{EMULATE_INTTYPES} to the -"Preprocessor Definitions". (Note that the various preprocessor -definitions have to be separated using semicolons.) Select "Release" in -the "Configuration" combo box and, again, add @code{EMULATE_INTTYPES} to -the "Preprocessor Definitions". (This has to be done separately because -debug and release builds have different preprocessor definitions.) -Finally, select "C/C++ / Code Generation" from the tree view. Select +@item Now, select "C/C++ / Code Generation" from the tree view. Select "Debug" in the "Configuration" combo box. Make sure that "Runtime Library" is set to "Multi-threaded Debug DLL". Then, select "Release" in the "Configuration" combo box and make sure that "Runtime Library" is diff --git a/libavutil/common.h b/libavutil/common.h index a1c5927a22..20cabaf5b5 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -10,6 +10,10 @@ # define CONFIG_WIN32 #endif +#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(EMULATE_INTTYPES) +# define EMULATE_INTTYPES +#endif + #ifndef M_PI #define M_PI 3.14159265358979323846 #endif |