TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-17 12:12:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compile fixes for latest VRPN and TIFF

Browse Source
This commit is contained in:
rdb 2016-04-22 17:18:27 +02:00
parent bffe3bf55a
commit 2c1cb4c313
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dtool/src/parser-inc/sys/time.h
View File

@ -2,3 +2,4 @@
struct timeval; struct timeval;
struct fd_set; struct fd_set;
struct timezone;

6
makepanda/makepanda.py
View File

@ -599,8 +599,12 @@ if (COMPILER == "MSVC"):
LibName("PNG", GetThirdpartyDir() + "png/lib/libpng16_static.lib") LibName("PNG", GetThirdpartyDir() + "png/lib/libpng16_static.lib")
else: else:
LibName("PNG", GetThirdpartyDir() + "png/lib/libpng_static.lib") LibName("PNG", GetThirdpartyDir() + "png/lib/libpng_static.lib")
if (PkgSkip("TIFF")==0):
if os.path.isfile(GetThirdpartyDir() + "tiff/lib/libtiff.lib"):
LibName("TIFF", GetThirdpartyDir() + "tiff/lib/libtiff.lib")
else:
LibName("TIFF", GetThirdpartyDir() + "tiff/lib/tiff.lib")
if (PkgSkip("JPEG")==0): LibName("JPEG", GetThirdpartyDir() + "jpeg/lib/jpeg-static.lib") if (PkgSkip("JPEG")==0): LibName("JPEG", GetThirdpartyDir() + "jpeg/lib/jpeg-static.lib")
if (PkgSkip("TIFF")==0): LibName("TIFF", GetThirdpartyDir() + "tiff/lib/libtiff.lib")
if (PkgSkip("ZLIB")==0): LibName("ZLIB", GetThirdpartyDir() + "zlib/lib/zlibstatic.lib") if (PkgSkip("ZLIB")==0): LibName("ZLIB", GetThirdpartyDir() + "zlib/lib/zlibstatic.lib")
if (PkgSkip("VRPN")==0): LibName("VRPN", GetThirdpartyDir() + "vrpn/lib/vrpn.lib") if (PkgSkip("VRPN")==0): LibName("VRPN", GetThirdpartyDir() + "vrpn/lib/vrpn.lib")
if (PkgSkip("VRPN")==0): LibName("VRPN", GetThirdpartyDir() + "vrpn/lib/quat.lib") if (PkgSkip("VRPN")==0): LibName("VRPN", GetThirdpartyDir() + "vrpn/lib/quat.lib")

8
panda/src/vrpn/vrpn_interface.h
View File

@ -27,6 +27,14 @@
#endif #endif
#endif #endif
// VPRN misses an include to this in vrpn_Shared.h.
#include <stdint.h>
// Prevent VRPN from defining this function, which we don't need,
// and cause compilation errors in MSVC 2015.
#include "vrpn_Configure.h"
#undef VRPN_EXPORT_GETTIMEOFDAY
#include "vrpn_Connection.h" #include "vrpn_Connection.h"
#include "vrpn_Tracker.h" #include "vrpn_Tracker.h"
#include "vrpn_Analog.h" #include "vrpn_Analog.h"