Commit 765c3440 authored by Fredrik Orderud's avatar Fredrik Orderud Committed by Diego Biurrun

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
parent 4d1ee6f9
...@@ -1015,14 +1015,7 @@ from the tree view, then add the files @file{avformat.lib}, ...@@ -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 Dependencies". Note that the names of the libraries have to be separated
using spaces. using spaces.
@item Now, select "C/C++ / Preprocessor" from the tree view. Select "Debug" @item Now, select "C/C++ / Code Generation" from the tree view. Select
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
"Debug" in the "Configuration" combo box. Make sure that "Runtime "Debug" in the "Configuration" combo box. Make sure that "Runtime
Library" is set to "Multi-threaded Debug DLL". Then, select "Release" in Library" is set to "Multi-threaded Debug DLL". Then, select "Release" in
the "Configuration" combo box and make sure that "Runtime Library" is the "Configuration" combo box and make sure that "Runtime Library" is
......
...@@ -10,6 +10,10 @@ ...@@ -10,6 +10,10 @@
# define CONFIG_WIN32 # define CONFIG_WIN32
#endif #endif
#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(EMULATE_INTTYPES)
# define EMULATE_INTTYPES
#endif
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment