Added MSVC support for sprintf_s
Added copyright notice to all platform libs Removed some (hopefully) unused libs git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@909 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
383d3101c9
commit
647356f7f9
|
@ -68,8 +68,15 @@ typedef double f64;
|
|||
#ifdef _IRR_WINDOWS_API_
|
||||
//! Defines for s{w,n}printf because these methods do not match the ISO C
|
||||
//! standard on Windows platforms, but it does on all others.
|
||||
//! These should be int snprintf(char *str, size_t size, const char *format, ...);
|
||||
//! and int swprintf(wchar_t *wcs, size_t maxlen, const wchar_t *format, ...);
|
||||
#if defined(_MSC_VER) && _MSC_VER > 1310
|
||||
#define swprintf swprintf_s
|
||||
#define snprintf sprintf_s
|
||||
#else
|
||||
#define swprintf _snwprintf
|
||||
#define snprintf _snprintf
|
||||
#endif
|
||||
|
||||
// define the wchar_t type if not already built in.
|
||||
#ifdef _MSC_VER
|
||||
|
@ -150,3 +157,4 @@ code like 'code', but some generate warnings so we use this macro here */
|
|||
|
||||
#endif // __IRR_TYPES_H_INCLUDED__
|
||||
|
||||
|
||||
|
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
#include "IrrCompileConfig.h"
|
||||
|
||||
static const char* const copyright = "Irrlicht Engine (c) 2002-2007 Nikolaus Gebhardt";
|
||||
|
||||
#ifdef _IRR_WINDOWS_
|
||||
#include <windows.h>
|
||||
#if defined(_DEBUG) && !defined(__GNUWIN32__)
|
||||
|
@ -44,10 +46,6 @@ namespace irr
|
|||
|
||||
#if defined(_IRR_WINDOWS_API_)
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma comment(exestr, "Irrlicht Engine (c) 2002-2007 Nikolaus Gebhardt")
|
||||
#endif
|
||||
|
||||
BOOL APIENTRY DllMain( HANDLE hModule,
|
||||
DWORD ul_reason_for_call,
|
||||
LPVOID lpReserved )
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
Name="VCLinkerTool"
|
||||
UseLibraryDependencyInputs="true"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib glu32.lib opengl32.lib"
|
||||
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
|
||||
OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
|
||||
LinkIncremental="2"
|
||||
SuppressStartupBanner="true"
|
||||
|
@ -178,7 +178,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib glu32.lib opengl32.lib"
|
||||
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib"
|
||||
OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
|
@ -283,7 +283,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="/MACHINE:I386"
|
||||
AdditionalDependencies="odbc32.lib odbccp32.lib"
|
||||
AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib opengl32.lib"
|
||||
OutputFile="..\..\bin\Win32-visualstudio\Irrlicht.dll"
|
||||
LinkIncremental="1"
|
||||
SuppressStartupBanner="true"
|
||||
|
|
Loading…
Reference in New Issue