Commit f4687fb2 authored by cutealien's avatar cutealien

Use #ifdef _MSC_VER instead of _IRR_WINDOWS_ when linking lib's with a pragma...

Use #ifdef _MSC_VER instead of _IRR_WINDOWS_ when linking lib's with a pragma comment. Thx @AReichl for reporting.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5059 dfc29bdd-3216-0410-991c-e03cc46cb475
parent c1c8ec28
...@@ -77,7 +77,7 @@ of the console window, which pops up when starting a program with main(). This ...@@ -77,7 +77,7 @@ of the console window, which pops up when starting a program with main(). This
is done by the second pragma. We could also use the WinMain method, though is done by the second pragma. We could also use the WinMain method, though
losing platform independence then. losing platform independence then.
*/ */
#ifdef _IRR_WINDOWS_ #ifdef _MSC_VER
#pragma comment(lib, "Irrlicht.lib") #pragma comment(lib, "Irrlicht.lib")
#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") #pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
#endif #endif
......
...@@ -21,7 +21,7 @@ using namespace video; ...@@ -21,7 +21,7 @@ using namespace video;
using namespace io; using namespace io;
using namespace gui; using namespace gui;
#ifdef _IRR_WINDOWS_ #ifdef _MSC_VER
#pragma comment(lib, "Irrlicht.lib") #pragma comment(lib, "Irrlicht.lib")
#endif #endif
......
...@@ -19,7 +19,9 @@ windows book for details. ...@@ -19,7 +19,9 @@ windows book for details.
using namespace irr; using namespace irr;
#ifdef _MSC_VER
#pragma comment(lib, "irrlicht.lib") #pragma comment(lib, "irrlicht.lib")
#endif
HWND hOKButton; HWND hOKButton;
HWND hWnd; HWND hWnd;
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifdef USE_IRRKLANG #ifdef USE_IRRKLANG
#include <irrKlang.h> #include <irrKlang.h>
#ifdef _IRR_WINDOWS_ #ifdef _MSC_VER
#pragma comment (lib, "irrKlang.lib") #pragma comment (lib, "irrKlang.lib")
#endif #endif
......
...@@ -14,7 +14,7 @@ using namespace video; ...@@ -14,7 +14,7 @@ using namespace video;
using namespace io; using namespace io;
using namespace gui; using namespace gui;
#ifdef _IRR_WINDOWS_ #ifdef _MSC_VER
#pragma comment(lib, "Irrlicht.lib") #pragma comment(lib, "Irrlicht.lib")
#endif #endif
......
...@@ -18,7 +18,7 @@ using namespace video; ...@@ -18,7 +18,7 @@ using namespace video;
using namespace io; using namespace io;
using namespace gui; using namespace gui;
#ifdef _IRR_WINDOWS_ #ifdef _MSC_VER
#pragma comment(lib, "Irrlicht.lib") #pragma comment(lib, "Irrlicht.lib")
#endif #endif
......
...@@ -54,7 +54,7 @@ collecting profiling information is disabled by default for speed reasons. ...@@ -54,7 +54,7 @@ collecting profiling information is disabled by default for speed reasons.
#include <irrlicht.h> #include <irrlicht.h>
#include "driverChoice.h" #include "driverChoice.h"
#ifdef _IRR_WINDOWS_ #ifdef _MSC_VER
#pragma comment(lib, "Irrlicht.lib") #pragma comment(lib, "Irrlicht.lib")
#endif #endif
......
...@@ -21,7 +21,7 @@ using namespace irr; ...@@ -21,7 +21,7 @@ using namespace irr;
#include <irrKlang.h> // problem here? go to http://www.ambiera.com/irrklang and download #include <irrKlang.h> // problem here? go to http://www.ambiera.com/irrklang and download
// the irrKlang library or undefine USE_IRRKLANG at the beginning // the irrKlang library or undefine USE_IRRKLANG at the beginning
// of this file. // of this file.
#ifdef _IRR_WINDOWS_ #ifdef _MSC_VER
#pragma comment (lib, "irrKlang.lib") #pragma comment (lib, "irrKlang.lib")
#endif #endif
#endif #endif
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
using namespace irr; using namespace irr;
#ifdef _WIN32 #ifdef _MSC_VER
#pragma comment(lib, "Irrlicht.lib") #pragma comment(lib, "Irrlicht.lib")
INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT ) INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
......
...@@ -9,7 +9,7 @@ using namespace video; ...@@ -9,7 +9,7 @@ using namespace video;
using namespace io; using namespace io;
using namespace gui; using namespace gui;
#ifdef _IRR_WINDOWS_ #ifdef _MSC_VER
#pragma comment(lib, "Irrlicht.lib") #pragma comment(lib, "Irrlicht.lib")
#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