diff options
| author | adrido <addi@king-arthur.eu> | 2016-10-24 06:49:35 +0200 |
|---|---|---|
| committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-25 13:54:24 +0200 |
| commit | a1e1323d6e2ac2304e56b414dd37975ba7c6b05d (patch) | |
| tree | 63be0b5d23af177df0846789b07c8374d383a56a /src/main.cpp | |
| parent | 98176481c1d0b6f8960574af1c2568085e37e433 (diff) | |
| download | minetest-a1e1323d6e2ac2304e56b414dd37975ba7c6b05d.tar.gz minetest-a1e1323d6e2ac2304e56b414dd37975ba7c6b05d.tar.bz2 minetest-a1e1323d6e2ac2304e56b414dd37975ba7c6b05d.zip | |
Windows: dont link to libraries that are already linked by cmake
This solves the problem whith building where build fails if the libaries have different names.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/main.cpp b/src/main.cpp index f63b6a986..a54454653 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,15 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef _MSC_VER - #ifndef SERVER // Dedicated server isn't linked with Irrlicht - #pragma comment(lib, "Irrlicht.lib") - // This would get rid of the console window - //#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") - #endif - #pragma comment(lib, "zlibwapi.lib") - #pragma comment(lib, "Shell32.lib") -#endif +// This would get rid of the console window +//#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") #include "irrlicht.h" // createDevice |