Fix MSVC compilation, clean up a bit
This commit is contained in:
parent
1929799b4b
commit
ad9b2f70b5
4 changed files with 6 additions and 6 deletions
|
@ -76,8 +76,6 @@ find_package(Threads REQUIRED)
|
|||
find_package(SimGear 2.9.0 REQUIRED)
|
||||
find_package(GDAL REQUIRED)
|
||||
find_package(TIFF REQUIRED) # needed for SRTM
|
||||
find_library(POCO_FOUNDATION PocoFoundation REQUIRED)
|
||||
find_library(POCO_NET PocoNet REQUIRED)
|
||||
|
||||
find_package(CGAL COMPONENTS Core REQUIRED)
|
||||
if (CGAL_FOUND)
|
||||
|
|
|
@ -45,7 +45,6 @@ private:
|
|||
// convert the BezierPoly to a normal Poly (adding nodes for the curves)
|
||||
void CreateConvexHull( void );
|
||||
void ConvertContour( BezContour* src, tgContour& dst );
|
||||
void ExpandContour( point_list& src, TGPolygon& dst, double dist );
|
||||
std::string GetMaterial( int surface );
|
||||
|
||||
|
||||
|
@ -64,9 +63,6 @@ private:
|
|||
// contour that nodes will be added until done
|
||||
BezContour* cur_contour;
|
||||
|
||||
// outer boundary as convex hull
|
||||
// point_list hull;
|
||||
|
||||
// Converted polygon after parsing complete
|
||||
tgPolygon pre_tess;
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#include <ctime>
|
||||
#include "debug.hxx"
|
||||
|
||||
std::map<long, std::string> thread_prefix_map;
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
#ifdef _MSC_VER
|
||||
# include <windows.h>
|
||||
# define sleep(x) Sleep(x*1000)
|
||||
#endif
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include <simgear/debug/logstream.hxx>
|
||||
|
|
Loading…
Add table
Reference in a new issue