From 9d62fb843a438214dc7f9c48b2c2a295847e0f3e Mon Sep 17 00:00:00 2001 From: Stefan de Bruijn Date: Fri, 10 Jul 2015 23:29:16 +0200 Subject: [PATCH] Visual Studio 2013, 3D SBS rendering and 2nd screen Added support for Visual studio 2013 Fixed TR1 -> std. Modern compilers give conflicts with std:: and boost:: when 'using namespace'. Implemented stereographic camera, that renders 3D-SBS images Added support for using a second screen in Windows --- .gitignore | 8 + libraries/openexr/IlmImf/ImfOutputFile.cpp | 1 + .../openexr/IlmImf/ImfScanLineInputFile.cpp | 1 + libraries/openexr/IlmImf/ImfTiledMisc.cpp | 1 + .../openexr/IlmImf/ImfTiledOutputFile.cpp | 1 + source/backend/bounding/boundingtask.cpp | 4 +- source/backend/bounding/boundingtask.h | 4 +- source/backend/control/renderbackend.cpp | 4 +- source/backend/control/renderbackend.h | 4 +- source/backend/control/scene.cpp | 8 +- source/backend/frame.h | 13 +- .../backend/lighting/photonestimationtask.cpp | 2 +- source/backend/lighting/photons.cpp | 6 +- source/backend/lighting/photons.h | 8 +- .../lighting/photonshootingstrategy.cpp | 2 +- .../backend/lighting/photonshootingstrategy.h | 2 +- .../backend/lighting/photonstrategytask.cpp | 2 +- source/backend/lighting/radiosity.cpp | 2 +- source/backend/lighting/radiosity.h | 2 +- source/backend/povray.cpp | 4 +- source/backend/render/rendertask.cpp | 4 +- source/backend/render/rendertask.h | 2 +- source/backend/render/tracepixel.cpp | 53 ++ source/backend/render/tracepixel.h | 4 + source/backend/scene/camera.cpp | 100 +-- source/backend/scene/camera.h | 5 + source/backend/scene/threaddata.cpp | 2 +- source/backend/scene/threaddata.h | 6 +- source/backend/scene/view.cpp | 26 +- source/backend/scene/view.h | 10 +- source/backend/support/randomsequences.cpp | 68 +- source/backend/support/randomsequences.h | 32 +- source/backend/support/task.cpp | 6 +- source/backend/support/task.h | 2 +- source/backend/support/taskqueue.cpp | 4 +- source/backend/support/taskqueue.h | 6 +- source/base/build.h | 3 +- source/base/image/colourspace.cpp | 2 +- source/base/image/colourspace.h | 4 +- source/base/image/encoding.h | 2 +- source/base/types.h | 1 + source/frontend/imageprocessing.cpp | 8 +- source/frontend/imageprocessing.h | 6 +- source/frontend/renderfrontend.cpp | 6 +- source/frontend/renderfrontend.h | 48 +- source/frontend/shelloutprocessing.h | 2 +- source/frontend/simplefrontend.h | 32 +- source/parser/parser.cpp | 47 +- source/parser/reservedwords.cpp | 7 +- source/parser/reservedwords.h | 5 + source/povmain.cpp | 4 +- source/precomp.h | 2 +- vfe/vfe.cpp | 16 +- vfe/vfe.h | 10 +- vfe/vfesession.cpp | 10 +- vfe/vfesession.h | 4 +- vfe/win/vfeplatform.cpp | 2 +- windows/povconfig/syspovconfig.h | 6 +- windows/povconfig/syspovconfig_msvc.h | 11 +- windows/pvdisplay.cpp | 86 ++- windows/pvdisplay.h | 4 +- windows/pvengine.cpp | 2 +- windows/vs13/StepOver.reg | Bin 0 -> 466 bytes windows/vs13/boost_date_time.vcxproj | 230 +++++++ windows/vs13/boost_date_time.vcxproj.filters | 26 + windows/vs13/boost_thread.vcxproj | 235 +++++++ windows/vs13/boost_thread.vcxproj.filters | 24 + windows/vs13/cmedit.vcxproj | 382 +++++++++++ windows/vs13/cmedit.vcxproj.filters | 88 +++ windows/vs13/console.vcxproj | 351 ++++++++++ windows/vs13/console.vcxproj.filters | 22 + windows/vs13/jpeg.vcxproj | 354 ++++++++++ windows/vs13/jpeg.vcxproj.filters | 178 +++++ windows/vs13/libpng.vcxproj | 329 +++++++++ windows/vs13/openexr_Half.vcxproj | 234 +++++++ windows/vs13/openexr_Half.vcxproj.filters | 29 + windows/vs13/openexr_Iex.vcxproj | 238 +++++++ windows/vs13/openexr_Iex.vcxproj.filters | 39 ++ windows/vs13/openexr_IlmImf.vcxproj | 359 ++++++++++ windows/vs13/openexr_IlmImf.vcxproj.filters | 387 +++++++++++ windows/vs13/openexr_IlmThread.vcxproj | 245 +++++++ .../vs13/openexr_IlmThread.vcxproj.filters | 60 ++ windows/vs13/openexr_b44ExpLogTable.vcxproj | 191 ++++++ .../openexr_b44ExpLogTable.vcxproj.filters | 14 + windows/vs13/openexr_eLut.vcxproj | 94 +++ windows/vs13/openexr_eLut.vcxproj.filters | 14 + windows/vs13/openexr_toFloat.vcxproj | 94 +++ windows/vs13/openexr_toFloat.vcxproj.filters | 14 + windows/vs13/povbackend.vcxproj | 471 +++++++++++++ windows/vs13/povbackend.vcxproj.filters | 403 ++++++++++++ windows/vs13/povbase.vcxproj | 449 +++++++++++++ windows/vs13/povbase.vcxproj.filters | 251 +++++++ windows/vs13/povcore.vcxproj | 436 ++++++++++++ windows/vs13/povcore.vcxproj.filters | 250 +++++++ windows/vs13/povfrontend.vcxproj | 393 +++++++++++ windows/vs13/povfrontend.vcxproj.filters | 101 +++ windows/vs13/povms.vcxproj | 374 +++++++++++ windows/vs13/povms.vcxproj.filters | 44 ++ windows/vs13/povparser.vcxproj | 379 +++++++++++ windows/vs13/povparser.vcxproj.filters | 63 ++ windows/vs13/povplatform.vcxproj | 369 +++++++++++ windows/vs13/povplatform.vcxproj.filters | 33 + windows/vs13/povray.sln | 418 ++++++++++++ windows/vs13/povray.vcxproj | 622 ++++++++++++++++++ windows/vs13/povray.vcxproj.filters | 267 ++++++++ windows/vs13/rtrsupport.vcxproj | 344 ++++++++++ windows/vs13/rtrsupport.vcxproj.filters | 36 + windows/vs13/tests.vcxproj | 107 +++ windows/vs13/tests.vcxproj.filters | 22 + windows/vs13/tifconf.mak | 10 + windows/vs13/tiff.vcxproj | 372 +++++++++++ windows/vs13/tiff.vcxproj.filters | 151 +++++ windows/vs13/vfewin.vcxproj | 393 +++++++++++ windows/vs13/vfewin.vcxproj.filters | 69 ++ windows/vs13/zlib.vcxproj | 301 +++++++++ windows/vs13/zlib.vcxproj.filters | 56 ++ 116 files changed, 11873 insertions(+), 281 deletions(-) create mode 100644 windows/vs13/StepOver.reg create mode 100644 windows/vs13/boost_date_time.vcxproj create mode 100644 windows/vs13/boost_date_time.vcxproj.filters create mode 100644 windows/vs13/boost_thread.vcxproj create mode 100644 windows/vs13/boost_thread.vcxproj.filters create mode 100644 windows/vs13/cmedit.vcxproj create mode 100644 windows/vs13/cmedit.vcxproj.filters create mode 100644 windows/vs13/console.vcxproj create mode 100644 windows/vs13/console.vcxproj.filters create mode 100644 windows/vs13/jpeg.vcxproj create mode 100644 windows/vs13/jpeg.vcxproj.filters create mode 100644 windows/vs13/libpng.vcxproj create mode 100644 windows/vs13/openexr_Half.vcxproj create mode 100644 windows/vs13/openexr_Half.vcxproj.filters create mode 100644 windows/vs13/openexr_Iex.vcxproj create mode 100644 windows/vs13/openexr_Iex.vcxproj.filters create mode 100644 windows/vs13/openexr_IlmImf.vcxproj create mode 100644 windows/vs13/openexr_IlmImf.vcxproj.filters create mode 100644 windows/vs13/openexr_IlmThread.vcxproj create mode 100644 windows/vs13/openexr_IlmThread.vcxproj.filters create mode 100644 windows/vs13/openexr_b44ExpLogTable.vcxproj create mode 100644 windows/vs13/openexr_b44ExpLogTable.vcxproj.filters create mode 100644 windows/vs13/openexr_eLut.vcxproj create mode 100644 windows/vs13/openexr_eLut.vcxproj.filters create mode 100644 windows/vs13/openexr_toFloat.vcxproj create mode 100644 windows/vs13/openexr_toFloat.vcxproj.filters create mode 100644 windows/vs13/povbackend.vcxproj create mode 100644 windows/vs13/povbackend.vcxproj.filters create mode 100644 windows/vs13/povbase.vcxproj create mode 100644 windows/vs13/povbase.vcxproj.filters create mode 100644 windows/vs13/povcore.vcxproj create mode 100644 windows/vs13/povcore.vcxproj.filters create mode 100644 windows/vs13/povfrontend.vcxproj create mode 100644 windows/vs13/povfrontend.vcxproj.filters create mode 100644 windows/vs13/povms.vcxproj create mode 100644 windows/vs13/povms.vcxproj.filters create mode 100644 windows/vs13/povparser.vcxproj create mode 100644 windows/vs13/povparser.vcxproj.filters create mode 100644 windows/vs13/povplatform.vcxproj create mode 100644 windows/vs13/povplatform.vcxproj.filters create mode 100644 windows/vs13/povray.sln create mode 100644 windows/vs13/povray.vcxproj create mode 100644 windows/vs13/povray.vcxproj.filters create mode 100644 windows/vs13/rtrsupport.vcxproj create mode 100644 windows/vs13/rtrsupport.vcxproj.filters create mode 100644 windows/vs13/tests.vcxproj create mode 100644 windows/vs13/tests.vcxproj.filters create mode 100644 windows/vs13/tifconf.mak create mode 100644 windows/vs13/tiff.vcxproj create mode 100644 windows/vs13/tiff.vcxproj.filters create mode 100644 windows/vs13/vfewin.vcxproj create mode 100644 windows/vs13/vfewin.vcxproj.filters create mode 100644 windows/vs13/zlib.vcxproj create mode 100644 windows/vs13/zlib.vcxproj.filters diff --git a/.gitignore b/.gitignore index 8582a45a5..4478fb995 100644 --- a/.gitignore +++ b/.gitignore @@ -195,3 +195,11 @@ unix/config/config.sub unix/config/depcomp unix/config/install-sh unix/config/missing +libraries/ilmbase/Half/eLut.h +libraries/ilmbase/Half/toFloat.h +libraries/openexr/IlmImf/b44ExpLogTable.h +libraries/png/pnglibconf.h +libraries/tiff/libtiff/tiffconf.h +libraries/tiff/libtiff/tif_config.h +*.bsc +windows/vs13/bin32/lib/cmedit32d.exp diff --git a/libraries/openexr/IlmImf/ImfOutputFile.cpp b/libraries/openexr/IlmImf/ImfOutputFile.cpp index 31a339e03..f6c8be665 100644 --- a/libraries/openexr/IlmImf/ImfOutputFile.cpp +++ b/libraries/openexr/IlmImf/ImfOutputFile.cpp @@ -58,6 +58,7 @@ #include #include #include +#include namespace Imf { diff --git a/libraries/openexr/IlmImf/ImfScanLineInputFile.cpp b/libraries/openexr/IlmImf/ImfScanLineInputFile.cpp index add23c2dc..fc85e04fc 100644 --- a/libraries/openexr/IlmImf/ImfScanLineInputFile.cpp +++ b/libraries/openexr/IlmImf/ImfScanLineInputFile.cpp @@ -56,6 +56,7 @@ #include #include #include +#include namespace Imf { diff --git a/libraries/openexr/IlmImf/ImfTiledMisc.cpp b/libraries/openexr/IlmImf/ImfTiledMisc.cpp index 7c723bb7c..e5af396bb 100644 --- a/libraries/openexr/IlmImf/ImfTiledMisc.cpp +++ b/libraries/openexr/IlmImf/ImfTiledMisc.cpp @@ -43,6 +43,7 @@ #include "Iex.h" #include #include +#include namespace Imf { diff --git a/libraries/openexr/IlmImf/ImfTiledOutputFile.cpp b/libraries/openexr/IlmImf/ImfTiledOutputFile.cpp index 9a96ac97c..81f1f8580 100644 --- a/libraries/openexr/IlmImf/ImfTiledOutputFile.cpp +++ b/libraries/openexr/IlmImf/ImfTiledOutputFile.cpp @@ -63,6 +63,7 @@ #include #include #include +#include namespace Imf { diff --git a/source/backend/bounding/boundingtask.cpp b/source/backend/bounding/boundingtask.cpp index 9e370c666..f96beeb50 100644 --- a/source/backend/bounding/boundingtask.cpp +++ b/source/backend/bounding/boundingtask.cpp @@ -133,8 +133,8 @@ class BSPProgress : public BSPTree::Progress BSPProgress(); }; -BoundingTask::BoundingTask(shared_ptr sd, unsigned int bt) : - SceneTask(new TraceThreadData(sd), boost::bind(&BoundingTask::SendFatalError, this, _1), "Bounding", sd), +BoundingTask::BoundingTask(std::shared_ptr sd, unsigned int bt) : + SceneTask(new TraceThreadData(sd), std::bind(&BoundingTask::SendFatalError, this, std::placeholders::_1), "Bounding", sd), sceneData(sd), boundingThreshold(bt) { diff --git a/source/backend/bounding/boundingtask.h b/source/backend/bounding/boundingtask.h index c95cfc7fc..13b91bbd8 100644 --- a/source/backend/bounding/boundingtask.h +++ b/source/backend/bounding/boundingtask.h @@ -52,7 +52,7 @@ class TraceThreadData; class BoundingTask : public SceneTask { public: - BoundingTask(shared_ptr sd, unsigned int bt); + BoundingTask(std::shared_ptr sd, unsigned int bt); virtual ~BoundingTask(); virtual void Run(); @@ -63,7 +63,7 @@ class BoundingTask : public SceneTask inline TraceThreadData *GetSceneDataPtr() { return reinterpret_cast(GetDataPtr()); } private: - shared_ptr sceneData; + std::shared_ptr sceneData; unsigned int boundingThreshold; void SendFatalError(pov_base::Exception& e); diff --git a/source/backend/control/renderbackend.cpp b/source/backend/control/renderbackend.cpp index 34039c2b3..b902befab 100644 --- a/source/backend/control/renderbackend.cpp +++ b/source/backend/control/renderbackend.cpp @@ -305,7 +305,7 @@ void RenderBackend::CreateScene(POVMS_Message& msg, POVMS_Message& result, int) if(err != kNoErr) throw POV_EXCEPTION_CODE (err); - shared_ptr scene(new Scene(backendAddress, msg.GetSourceAddress(), scenecounter + 1)); + std::shared_ptr scene(new Scene(backendAddress, msg.GetSourceAddress(), scenecounter + 1)); scenecounter++; @@ -388,7 +388,7 @@ void RenderBackend::CreateView(POVMS_Message& msg, POVMS_Message& result, int) if(i == scenes.end()) throw POV_EXCEPTION_CODE(kInvalidIdentifierErr); - shared_ptr view(i->second->NewView(msg.TryGetInt(kPOVAttrib_Width, 160), msg.TryGetInt(kPOVAttrib_Height, 120), viewcounter + 1)); + std::shared_ptr view(i->second->NewView(msg.TryGetInt(kPOVAttrib_Width, 160), msg.TryGetInt(kPOVAttrib_Height, 120), viewcounter + 1)); viewcounter++; diff --git a/source/backend/control/renderbackend.h b/source/backend/control/renderbackend.h index 29eb8f6bb..5989de948 100644 --- a/source/backend/control/renderbackend.h +++ b/source/backend/control/renderbackend.h @@ -117,8 +117,8 @@ class RenderBackend : public POVMS_MessageReceiver ViewId viewcounter; typedef std::set ViewIdSet; - typedef std::map > SceneMap; - typedef std::map > ViewMap; + typedef std::map > SceneMap; + typedef std::map > ViewMap; typedef std::map Scene2ViewsMap; typedef std::map View2SceneMap; diff --git a/source/backend/control/scene.cpp b/source/backend/control/scene.cpp index f65204e8c..ee2874210 100644 --- a/source/backend/control/scene.cpp +++ b/source/backend/control/scene.cpp @@ -83,9 +83,9 @@ void Scene::StartParser(POVMS_Object& parseOptions) // A scene can only be parsed once if(parserControlThread == NULL) #ifndef USE_OFFICIAL_BOOST - parserControlThread = new boost::thread(boost::bind(&Scene::ParserControlThread, this), 1024 * 64); + parserControlThread = new boost::thread(std::bind(&Scene::ParserControlThread, this), 1024 * 64); #else - parserControlThread = new boost::thread(boost::bind(&Scene::ParserControlThread, this)); + parserControlThread = new boost::thread(std::bind(&Scene::ParserControlThread, this)); #endif else return; @@ -174,10 +174,10 @@ void Scene::StartParser(POVMS_Object& parseOptions) parserTasks.AppendSync(); // send statistics - parserTasks.AppendFunction(boost::bind(&Scene::SendStatistics, this, _1)); + parserTasks.AppendFunction(std::bind(&Scene::SendStatistics, this, std::placeholders::_1)); // send done message and compatibility data - parserTasks.AppendFunction(boost::bind(&Scene::SendDoneMessage, this, _1)); + parserTasks.AppendFunction(std::bind(&Scene::SendDoneMessage, this, std::placeholders::_1)); } void Scene::StopParser() diff --git a/source/backend/frame.h b/source/backend/frame.h index 9a68abc09..18b802844 100644 --- a/source/backend/frame.h +++ b/source/backend/frame.h @@ -55,6 +55,7 @@ #include #include +#include #include "base/configbase.h" #include "backend/configbackend.h" @@ -963,7 +964,7 @@ class Interior SNGL Fade_Distance, Fade_Power; MathColour Fade_Colour; vector media; - shared_ptr subsurface; + std::shared_ptr subsurface; Interior(); Interior(const Interior&); @@ -976,8 +977,8 @@ class Interior Interior& operator=(const Interior&); }; -typedef shared_ptr InteriorPtr; -typedef shared_ptr ConstInteriorPtr; +typedef std::shared_ptr InteriorPtr; +typedef std::shared_ptr ConstInteriorPtr; /// @} /// @@ -1023,8 +1024,8 @@ typedef shared_ptr ConstInteriorPtr; struct BasicPattern; -typedef shared_ptr PatternPtr; -typedef shared_ptr ConstPatternPtr; +typedef std::shared_ptr PatternPtr; +typedef std::shared_ptr ConstPatternPtr; struct Pattern_Struct @@ -1430,7 +1431,7 @@ class FractalRules virtual bool Bound (const BasicRay&, const Fractal *, DBL *, DBL *) const = 0; }; -typedef shared_ptr FractalRulesPtr; +typedef std::shared_ptr FractalRulesPtr; struct QualityFlags diff --git a/source/backend/lighting/photonestimationtask.cpp b/source/backend/lighting/photonestimationtask.cpp index 9b61ae147..0e525a098 100644 --- a/source/backend/lighting/photonestimationtask.cpp +++ b/source/backend/lighting/photonestimationtask.cpp @@ -136,7 +136,7 @@ void PhotonEstimationTask::Finish() void PhotonEstimationTask::SearchThroughObjectsEstimatePhotons(vector& Objects, LightSource *Light) { ViewThreadData *renderDataPtr = GetViewDataPtr(); - shared_ptr sceneData = GetSceneData(); + std::shared_ptr sceneData = GetSceneData(); /* check this object and all siblings */ for(vector::iterator Sib = Objects.begin(); Sib != Objects.end(); Sib++) diff --git a/source/backend/lighting/photons.cpp b/source/backend/lighting/photons.cpp index 54ff10338..08dc62fe1 100644 --- a/source/backend/lighting/photons.cpp +++ b/source/backend/lighting/photons.cpp @@ -107,7 +107,7 @@ const int PHOTON_BLOCK_MASK = (PHOTON_BLOCK_SIZE-1); const int INITIAL_BASE_ARRAY_SIZE = 100; -PhotonTrace::PhotonTrace(shared_ptr sd, TraceThreadData *td, unsigned int mtl, DBL adcb, const QualityFlags& qf, Trace::CooperateFunctor& cf) : +PhotonTrace::PhotonTrace(std::shared_ptr sd, TraceThreadData *td, unsigned int mtl, DBL adcb, const QualityFlags& qf, Trace::CooperateFunctor& cf) : Trace(sd, td, qf, cf, mediaPhotons, noRadiosity), mediaPhotons(sd, td, this, new PhotonGatherer(&sd->mediaPhotonMap, sd->photonSettings)) { @@ -932,7 +932,7 @@ void PhotonTrace::addSurfacePhoton(const Vector3d& Point, const Vector3d& Origin } -PhotonMediaFunction::PhotonMediaFunction(shared_ptr sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg) : +PhotonMediaFunction::PhotonMediaFunction(std::shared_ptr sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg) : MediaFunction(td, t, pg), sceneData(sd) { @@ -2707,7 +2707,7 @@ int LightTargetCombo::computeMergedFlags() } -void LightTargetCombo::computeAnglesAndDeltas(shared_ptr sceneData) +void LightTargetCombo::computeAnglesAndDeltas(std::shared_ptr sceneData) { shootingDirection.compute(); diff --git a/source/backend/lighting/photons.h b/source/backend/lighting/photons.h index 98e61f30f..ceb6e3e54 100644 --- a/source/backend/lighting/photons.h +++ b/source/backend/lighting/photons.h @@ -300,14 +300,14 @@ class PhotonGatherer class PhotonMediaFunction : public MediaFunction { public: - PhotonMediaFunction(shared_ptr sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg); + PhotonMediaFunction(std::shared_ptr sd, TraceThreadData *td, Trace *t, PhotonGatherer *pg); void ComputeMediaAndDepositPhotons(MediaVector& medias, const Ray& ray, const Intersection& isect, MathColour& colour); protected: void DepositMediaPhotons(MathColour& colour, MediaVector& medias, LightSourceEntryVector& lights, MediaIntervalVector& mediaintervals, const Ray& ray, int minsamples, bool ignore_photons, bool use_scattering, bool all_constant_and_light_ray); private: - shared_ptr sceneData; + std::shared_ptr sceneData; void addMediaPhoton(const Vector3d& Point, const Vector3d& Origin, const MathColour& LightCol, DBL depthDiff); }; @@ -315,7 +315,7 @@ class PhotonMediaFunction : public MediaFunction class PhotonTrace : public Trace { public: - PhotonTrace(shared_ptr sd, TraceThreadData *td, unsigned int mtl, DBL adcb, const QualityFlags& qf, Trace::CooperateFunctor& cf); + PhotonTrace(std::shared_ptr sd, TraceThreadData *td, unsigned int mtl, DBL adcb, const QualityFlags& qf, Trace::CooperateFunctor& cf); ~PhotonTrace(); virtual DBL TraceRay(Ray& ray, MathColour& colour, ColourChannel&, COLC weight, bool continuedRay, DBL maxDepth = 0.0); @@ -368,7 +368,7 @@ class LightTargetCombo ShootingDirection shootingDirection; int computeMergedFlags(); - void computeAnglesAndDeltas(shared_ptr sceneData); + void computeAnglesAndDeltas(std::shared_ptr sceneData); }; diff --git a/source/backend/lighting/photonshootingstrategy.cpp b/source/backend/lighting/photonshootingstrategy.cpp index 46f643c65..7e422cdab 100644 --- a/source/backend/lighting/photonshootingstrategy.cpp +++ b/source/backend/lighting/photonshootingstrategy.cpp @@ -81,7 +81,7 @@ PhotonShootingUnit* PhotonShootingStrategy::getNextUnit() return unit; } -void PhotonShootingStrategy::createUnitsForCombo(ObjectPtr obj, LightSource* light, shared_ptr sceneData) +void PhotonShootingStrategy::createUnitsForCombo(ObjectPtr obj, LightSource* light, std::shared_ptr sceneData) { PhotonShootingUnit* unit = new PhotonShootingUnit(light, obj); unit->lightAndObject.computeAnglesAndDeltas(sceneData); diff --git a/source/backend/lighting/photonshootingstrategy.h b/source/backend/lighting/photonshootingstrategy.h index f79ea8e04..7b9ca6d09 100644 --- a/source/backend/lighting/photonshootingstrategy.h +++ b/source/backend/lighting/photonshootingstrategy.h @@ -56,7 +56,7 @@ class PhotonShootingStrategy vector units; - void createUnitsForCombo(ObjectPtr obj, LightSource* light, shared_ptr sceneData); + void createUnitsForCombo(ObjectPtr obj, LightSource* light, std::shared_ptr sceneData); void start(); PhotonShootingUnit* getNextUnit(); diff --git a/source/backend/lighting/photonstrategytask.cpp b/source/backend/lighting/photonstrategytask.cpp index aae327198..3eebbfcda 100644 --- a/source/backend/lighting/photonstrategytask.cpp +++ b/source/backend/lighting/photonstrategytask.cpp @@ -170,7 +170,7 @@ void PhotonStrategyTask::Finish() void PhotonStrategyTask::SearchThroughObjectsCreateUnits(vector& Objects, LightSource *Light) { - shared_ptr sceneData = GetSceneData(); + std::shared_ptr sceneData = GetSceneData(); /* check this object and all siblings */ for(vector::iterator Sib = Objects.begin(); Sib != Objects.end(); Sib++) diff --git a/source/backend/lighting/radiosity.cpp b/source/backend/lighting/radiosity.cpp index 1de81fcea..c9bcbd47b 100644 --- a/source/backend/lighting/radiosity.cpp +++ b/source/backend/lighting/radiosity.cpp @@ -291,7 +291,7 @@ RadiosityRecursionSettings* SceneRadiositySettings::GetRecursionSettings(bool fi return recSettings; } -RadiosityFunction::RadiosityFunction(shared_ptr sd, TraceThreadData *td, const SceneRadiositySettings& rs, +RadiosityFunction::RadiosityFunction(std::shared_ptr sd, TraceThreadData *td, const SceneRadiositySettings& rs, RadiosityCache& rc, Trace::CooperateFunctor& cf, bool ft, const Vector3d& camera) : threadData(td), trace(sd, td, GetRadiosityQualityFlags(rs, QualityFlags(9)), cf, media, *this), // TODO FIXME - we can only use hard-coded Level-9 quality because Radiosity happens to be disabled at lower settings! diff --git a/source/backend/lighting/radiosity.h b/source/backend/lighting/radiosity.h index f501834f9..6c9d258a2 100644 --- a/source/backend/lighting/radiosity.h +++ b/source/backend/lighting/radiosity.h @@ -253,7 +253,7 @@ class RadiosityFunction : public Trace::RadiosityFunctor // cf - the cooperate functor (whatever that is - some thing that handles inter-thread communication?) // pts - number of the current pretrace step (PRETRACE_FIRST to PRETRACE_MAX, or FINAL_TRACE for main render) // camera - position of the camera - RadiosityFunction(shared_ptr sd, TraceThreadData *td, + RadiosityFunction(std::shared_ptr sd, TraceThreadData *td, const SceneRadiositySettings& rs, RadiosityCache& rc, Trace::CooperateFunctor& cf, bool ft, const Vector3d& camera); virtual ~RadiosityFunction(); diff --git a/source/backend/povray.cpp b/source/backend/povray.cpp index dac3202f8..49b9e9bb2 100644 --- a/source/backend/povray.cpp +++ b/source/backend/povray.cpp @@ -589,9 +589,9 @@ boost::thread *povray_init(const boost::function0& threadExit, POVMSAddres pov::InitializePatternGenerators(); #ifndef USE_OFFICIAL_BOOST - POV_MainThread = new boost::thread(boost::bind(&MainThreadFunction, threadExit), 1024 * 64); + POV_MainThread = new boost::thread(std::bind(&MainThreadFunction, threadExit), 1024 * 64); #else - POV_MainThread = new boost::thread(boost::bind(&MainThreadFunction, threadExit)); + POV_MainThread = new boost::thread(std::bind(&MainThreadFunction, threadExit)); #endif // we can't depend on boost::thread::yield here since under windows it is not diff --git a/source/backend/render/rendertask.cpp b/source/backend/render/rendertask.cpp index a2a91d200..c008c15e7 100644 --- a/source/backend/render/rendertask.cpp +++ b/source/backend/render/rendertask.cpp @@ -58,7 +58,7 @@ namespace pov using namespace pov_base; RenderTask::RenderTask(ViewData *vd, const char* sn, RenderBackend::ViewId vid) : - SceneTask(new ViewThreadData(vd), boost::bind(&RenderTask::SendFatalError, this, _1), sn, vd->GetSceneData(), vid), + SceneTask(new ViewThreadData(vd), std::bind(&RenderTask::SendFatalError, this, std::placeholders::_1), sn, vd->GetSceneData(), vid), viewData(vd) { } @@ -67,7 +67,7 @@ RenderTask::~RenderTask() { } -shared_ptr& RenderTask::GetSceneData() +std::shared_ptr& RenderTask::GetSceneData() { return viewData->GetSceneData(); } diff --git a/source/backend/render/rendertask.h b/source/backend/render/rendertask.h index 3300be7ec..ed0c0ada3 100644 --- a/source/backend/render/rendertask.h +++ b/source/backend/render/rendertask.h @@ -54,7 +54,7 @@ class RenderTask : public SceneTask virtual void Run() = 0; virtual void Stopped() = 0; - shared_ptr& GetSceneData(); + std::shared_ptr& GetSceneData(); ViewData *GetViewData(); inline ViewThreadData *GetViewDataPtr() { return reinterpret_cast(GetDataPtr()); } diff --git a/source/backend/render/tracepixel.cpp b/source/backend/render/tracepixel.cpp index e199e76e8..b48a51c44 100644 --- a/source/backend/render/tracepixel.cpp +++ b/source/backend/render/tracepixel.cpp @@ -227,6 +227,9 @@ void TracePixel::SetupCamera(const Camera& cam) cameraLengthRight = cameraRight.length(); cameraLengthUp = cameraUp.length(); + Zero_Parallax = camera.Zero_Parallax; + Eye_Offset = camera.Eye_Offset; + switch(camera.Type) { case CYL_1_CAMERA: @@ -312,6 +315,9 @@ bool TracePixel::CreateCameraRay(Ray& ray, DBL x, DBL y, DBL width, DBL height, Vector3d V1; TRANSFORM Trans; + DBL half; + Vector3d tempv; + // Move to center of pixel x += 0.5; y -= 0.5; @@ -345,6 +351,53 @@ bool TracePixel::CreateCameraRay(Ray& ray, DBL x, DBL y, DBL width, DBL height, InitRayContainerState(ray); break; + // 3D SBS, Stereoscopic perspective camera + case STEREOSCOPIC_CAMERA: + + half = width / 2.0; + if (x < half) + { + // Normalised projection plane coordinates from -0.5 to 0.5. + x0 = x / half - 0.5; + y0 = ((height - 1) - y) / height - 0.5; + + // Offset ray length + x0 -= Eye_Offset / (2 * Zero_Parallax * tan(camera.Angle * M_PI_360)); + + // Create primary ray + ray.Direction = cameraDirection + x0 * cameraRight + y0 * cameraUp; + + // Offset the camera + ray.Origin = cameraLocation - Eye_Offset * cameraRight.normalized(); + } + else + { + // Normalised projection plane coordinates from -0.5 to 0.5. + x0 = (x - half) / half - 0.5; + y0 = ((height - 1) - y) / height - 0.5; + + // Offset ray length + x0 += Eye_Offset / (2 * Zero_Parallax * tan(camera.Angle * M_PI_360)); + + // Create primary ray + ray.Direction = cameraDirection + x0 * cameraRight + y0 * cameraUp; + + // Offset the camera + ray.Origin = cameraLocation + Eye_Offset * cameraRight.normalized(); + } + + // Do focal blurring + if (useFocalBlur) + { + JitterCameraRay(ray, x, y, ray_number); + InitRayContainerState(ray, true); + } + else + { + InitRayContainerState(ray); // ,true? + } + break; + // Orthographic projection. case ORTHOGRAPHIC_CAMERA: // Convert the x coordinate to be a DBL from -0.5 to 0.5. diff --git a/source/backend/render/tracepixel.h b/source/backend/render/tracepixel.h index eaece7f2c..73deb9abb 100644 --- a/source/backend/render/tracepixel.h +++ b/source/backend/render/tracepixel.h @@ -98,6 +98,10 @@ class TracePixel : public Trace bool precomputeContainingInteriors; RayInteriorVector containingInteriors; + // 3D rendering support + DBL Zero_Parallax; /* Distance to zero parallax */ + DBL Eye_Offset; /* + or - 1/2 eye separation */ + Vector3d cameraDirection; Vector3d cameraRight; Vector3d cameraUp; diff --git a/source/backend/scene/camera.cpp b/source/backend/scene/camera.cpp index bbef0c9f2..b499f1711 100644 --- a/source/backend/scene/camera.cpp +++ b/source/backend/scene/camera.cpp @@ -56,15 +56,15 @@ namespace pov * Translate_Camera * * INPUT -* +* * OUTPUT -* +* * RETURNS -* +* * AUTHOR * * POV-Ray Team -* +* * DESCRIPTION * * - @@ -77,7 +77,7 @@ namespace pov void Camera::Translate(const Vector3d& Vector) { - Location += Vector; + Location += Vector; } @@ -89,15 +89,15 @@ void Camera::Translate(const Vector3d& Vector) * Rotate_Camera * * INPUT -* +* * OUTPUT -* +* * RETURNS -* +* * AUTHOR * * POV-Ray Team -* +* * DESCRIPTION * * - @@ -110,10 +110,10 @@ void Camera::Translate(const Vector3d& Vector) void Camera::Rotate(const Vector3d& Vector) { - TRANSFORM Trans; + TRANSFORM Trans; - Compute_Rotation_Transform(&Trans, Vector); - Transform(&Trans); + Compute_Rotation_Transform(&Trans, Vector); + Transform(&Trans); } @@ -125,15 +125,15 @@ void Camera::Rotate(const Vector3d& Vector) * Scale_Camera * * INPUT -* +* * OUTPUT -* +* * RETURNS -* +* * AUTHOR * * POV-Ray Team -* +* * DESCRIPTION * * - @@ -146,10 +146,10 @@ void Camera::Rotate(const Vector3d& Vector) void Camera::Scale(const Vector3d& Vector) { - TRANSFORM Trans; + TRANSFORM Trans; - Compute_Scaling_Transform(&Trans, Vector); - Transform(&Trans); + Compute_Scaling_Transform(&Trans, Vector); + Transform(&Trans); } @@ -161,15 +161,15 @@ void Camera::Scale(const Vector3d& Vector) * Transform_Camera * * INPUT -* +* * OUTPUT -* +* * RETURNS -* +* * AUTHOR * * POV-Ray Team -* +* * DESCRIPTION * * - @@ -182,10 +182,10 @@ void Camera::Scale(const Vector3d& Vector) void Camera::Transform(const TRANSFORM *Trans) { - MTransPoint(Location, Location, Trans); - MTransDirection(Direction, Direction, Trans); - MTransDirection(Up, Up, Trans); - MTransDirection(Right, Right, Trans); + MTransPoint(Location, Location, Trans); + MTransDirection(Direction, Direction, Trans); + MTransDirection(Up, Up, Trans); + MTransDirection(Right, Right, Trans); } @@ -197,15 +197,15 @@ void Camera::Transform(const TRANSFORM *Trans) * Camera::Init * * INPUT -* +* * OUTPUT -* +* * RETURNS -* +* * AUTHOR * * POV-Ray Team -* +* * DESCRIPTION * * - @@ -234,6 +234,9 @@ void Camera::Init() Aperture = 0.0; Focal_Distance = -1.0; + Zero_Parallax = 2.5; + Eye_Offset = 0.5/30.0; + /* Set default camera type and viewing angle. [DB 7/94] */ Type = PERSPECTIVE_CAMERA; Angle = 90.0; @@ -262,15 +265,15 @@ void Camera::Init() * Create_Camera * * INPUT -* +* * OUTPUT -* +* * RETURNS -* +* * AUTHOR * * POV-Ray Team -* +* * DESCRIPTION * * - @@ -283,7 +286,7 @@ void Camera::Init() Camera::Camera() { - Init(); + Init(); } @@ -316,7 +319,7 @@ Camera::Camera() Camera& Camera::operator=(const Camera& src) { - Location = src.Location; + Location = src.Location; Direction = src.Direction; Up = src.Up; Right = src.Right; @@ -324,6 +327,9 @@ Camera& Camera::operator=(const Camera& src) Look_At = src.Look_At; Focal_Point = src.Focal_Point; + Zero_Parallax = src.Zero_Parallax; + Eye_Offset = src.Eye_Offset; + Focal_Distance = src.Focal_Distance; Aperture = src.Aperture; Blur_Samples = src.Blur_Samples; @@ -367,10 +373,10 @@ Camera& Camera::operator=(const Camera& src) Camera::Camera(const Camera& src) { - Tnormal = NULL; - Trans = NULL; - Bokeh = NULL; - operator=(src); + Tnormal = NULL; + Trans = NULL; + Bokeh = NULL; + operator=(src); } /***************************************************************************** @@ -401,12 +407,12 @@ Camera::Camera(const Camera& src) Camera::~Camera() { - Destroy_Tnormal(Tnormal); - Destroy_Transform(Trans); - Destroy_Pigment(Bokeh); - for (std::vector::iterator it = Meshes.begin(); it != Meshes.end(); it++) - Destroy_Object(*it); - Meshes.clear(); + Destroy_Tnormal(Tnormal); + Destroy_Transform(Trans); + Destroy_Pigment(Bokeh); + for (std::vector::iterator it = Meshes.begin(); it != Meshes.end(); it++) + Destroy_Object(*it); + Meshes.clear(); } } diff --git a/source/backend/scene/camera.h b/source/backend/scene/camera.h index d6f6405e8..f2e6042e5 100644 --- a/source/backend/scene/camera.h +++ b/source/backend/scene/camera.h @@ -59,6 +59,7 @@ namespace pov #define CYL_4_CAMERA 10 #define SPHERICAL_CAMERA 11 #define MESH_CAMERA 12 +#define STEREOSCOPIC_CAMERA 20 /***************************************************************************** * Global typedefs @@ -98,6 +99,10 @@ class Camera DBL Max_Ray_Distance; // if not 0.0, then maximum distance to look along the ray for an intersection // end of mesh camera declarations + // These are used for stereographic camera's: + DBL Zero_Parallax; /* Distance to zero parallax */ + DBL Eye_Offset; /* + or - 1/2 eye separation */ + Camera(); Camera(const Camera& src); ~Camera(); diff --git a/source/backend/scene/threaddata.cpp b/source/backend/scene/threaddata.cpp index 62f86afd1..eb958980c 100644 --- a/source/backend/scene/threaddata.cpp +++ b/source/backend/scene/threaddata.cpp @@ -57,7 +57,7 @@ namespace pov { -TraceThreadData::TraceThreadData(shared_ptr sd): sceneData(sd), qualityFlags(9) +TraceThreadData::TraceThreadData(std::shared_ptr sd): sceneData(sd), qualityFlags(9) { for(int i = 0; i < 4; i++) Fractal_IStack[i] = NULL; diff --git a/source/backend/scene/threaddata.h b/source/backend/scene/threaddata.h index 98a60debc..412865490 100644 --- a/source/backend/scene/threaddata.h +++ b/source/backend/scene/threaddata.h @@ -77,7 +77,7 @@ class TraceThreadData : public Task::TaskData * Create thread local data. * @param sd Scene data defining scene attributes. */ - TraceThreadData(shared_ptr sd); + TraceThreadData(std::shared_ptr sd); /** * Get the statistics. @@ -162,11 +162,11 @@ class TraceThreadData : public Task::TaskData POV_LONG realTime; QualityFlags qualityFlags; // TODO FIXME - remove again - inline shared_ptr GetSceneData() const { return sceneData; } + inline std::shared_ptr GetSceneData() const { return sceneData; } protected: /// scene data - shared_ptr sceneData; + std::shared_ptr sceneData; /// render statistics RenderStatistics renderStats; diff --git a/source/backend/scene/view.cpp b/source/backend/scene/view.cpp index 2ad8de8fe..d08bddb73 100644 --- a/source/backend/scene/view.cpp +++ b/source/backend/scene/view.cpp @@ -81,7 +81,7 @@ inline unsigned int MakePowerOfTwo(unsigned int i) return 1 << ii; } -ViewData::ViewData(shared_ptr sd) : +ViewData::ViewData(std::shared_ptr sd) : nextBlock(0), completedFirstPass(false), highestTraceLevel(0), @@ -565,7 +565,7 @@ RadiosityCache& ViewData::GetRadiosityCache() return radiosityCache; } -View::View(shared_ptr sd, unsigned int width, unsigned int height, RenderBackend::ViewId vid) : +View::View(std::shared_ptr sd, unsigned int width, unsigned int height, RenderBackend::ViewId vid) : viewData(sd), stopRequsted(false), mailbox(0), @@ -627,7 +627,7 @@ bool View::CheckCameraHollowObject(const Vector3d& point, const BBOX_TREE *node) bool View::CheckCameraHollowObject(const Vector3d& point) { - shared_ptr& sd = viewData.GetSceneData(); + std::shared_ptr& sd = viewData.GetSceneData(); if(sd->boundingMethod == 2) { @@ -674,13 +674,13 @@ void View::StartRender(POVMS_Object& renderOptions) unsigned int previewendsize = 0; unsigned int nextblock = 0; bool highReproducibility = false; - shared_ptr blockskiplist(new ViewData::BlockIdSet()); + std::shared_ptr blockskiplist(new ViewData::BlockIdSet()); if(renderControlThread == NULL) #ifndef USE_OFFICIAL_BOOST - renderControlThread = new thread(boost::bind(&View::RenderControlThread, this), 1024 * 64); + renderControlThread = new thread(std::bind(&View::RenderControlThread, this), 1024 * 64); #else - renderControlThread = new boost::thread(boost::bind(&View::RenderControlThread, this)); + renderControlThread = new boost::thread(std::bind(&View::RenderControlThread, this)); #endif viewData.qualityFlags = QualityFlags(clip(renderOptions.TryGetInt(kPOVAttrib_Quality, 9), 0, 9)); @@ -1054,7 +1054,7 @@ void View::StartRender(POVMS_Object& renderOptions) renderTasks.AppendSync(); // reset block size counter and block skip list for next pretrace step - renderTasks.AppendFunction(boost::bind(&View::SetNextRectangle, this, _1, blockskiplist, nextblock)); + renderTasks.AppendFunction(std::bind(&View::SetNextRectangle, this, std::placeholders::_1, blockskiplist, nextblock)); // wait for block size counter and block skip list reset to finish renderTasks.AppendSync(); @@ -1073,7 +1073,7 @@ void View::StartRender(POVMS_Object& renderOptions) renderTasks.AppendSync(); // reset block size counter and block skip list for final render - renderTasks.AppendFunction(boost::bind(&View::SetNextRectangle, this, _1, blockskiplist, nextblock)); + renderTasks.AppendFunction(std::bind(&View::SetNextRectangle, this, std::placeholders::_1, blockskiplist, nextblock)); // wait for block size counter and block skip list reset to finish renderTasks.AppendSync(); @@ -1095,7 +1095,7 @@ void View::StartRender(POVMS_Object& renderOptions) renderTasks.AppendSync(); // reset block size counter and block skip list - renderTasks.AppendFunction(boost::bind(&View::SetNextRectangle, this, _1, blockskiplist, nextblock)); + renderTasks.AppendFunction(std::bind(&View::SetNextRectangle, this, std::placeholders::_1, blockskiplist, nextblock)); // wait for block size counter and block skip list reset to finish renderTasks.AppendSync(); @@ -1112,7 +1112,7 @@ void View::StartRender(POVMS_Object& renderOptions) renderTasks.AppendSync(); // reset block size counter and block skip list - renderTasks.AppendFunction(boost::bind(&View::SetNextRectangle, this, _1, blockskiplist, nextblock)); + renderTasks.AppendFunction(std::bind(&View::SetNextRectangle, this, std::placeholders::_1, blockskiplist, nextblock)); // wait for block size counter and block skip list reset to finish renderTasks.AppendSync(); @@ -1132,13 +1132,13 @@ void View::StartRender(POVMS_Object& renderOptions) renderTasks.AppendSync(); // send shutdown messages - renderTasks.AppendFunction(boost::bind(&View::DispatchShutdownMessages, this, _1)); + renderTasks.AppendFunction(std::bind(&View::DispatchShutdownMessages, this, std::placeholders::_1)); // wait for shutdown messages to be sent renderTasks.AppendSync(); // send statistics - renderTasks.AppendFunction(boost::bind(&View::SendStatistics, this, _1)); + renderTasks.AppendFunction(std::bind(&View::SendStatistics, this, std::placeholders::_1)); // send done message POVMS_Message doneMessage(kPOVObjectClass_ResultData, kPOVMsgClass_ViewOutput, kPOVMsgIdent_Done); @@ -1377,7 +1377,7 @@ void View::SendStatistics(TaskQueue&) viewThreadData.clear(); } -void View::SetNextRectangle(TaskQueue&, shared_ptr bsl, unsigned int fs) +void View::SetNextRectangle(TaskQueue&, std::shared_ptr bsl, unsigned int fs) { viewData.SetNextRectangle(*bsl, fs); } diff --git a/source/backend/scene/view.h b/source/backend/scene/view.h index fc96acf80..2687f2e77 100644 --- a/source/backend/scene/view.h +++ b/source/backend/scene/view.h @@ -219,7 +219,7 @@ class ViewData * Get the scene data for this view. * @return Scene data. */ - inline shared_ptr& GetSceneData() { return sceneData; } + inline std::shared_ptr& GetSceneData() { return sceneData; } /** * Get the view id for this view. @@ -318,7 +318,7 @@ class ViewData /// generated radiosity data RadiosityCache radiosityCache; /// scene data - shared_ptr sceneData; + std::shared_ptr sceneData; /// view id RenderBackend::ViewId viewId; @@ -342,7 +342,7 @@ class ViewData * Create view data. * @param sd Scene data associated with the view data. */ - ViewData(shared_ptr sd); + ViewData(std::shared_ptr sd); /** * Destructor. @@ -457,7 +457,7 @@ class View * @param vid Id of this view to include with * POVMS messages sent to the frontend. */ - explicit View(shared_ptr sd, unsigned int width, unsigned int height, RenderBackend::ViewId vid); + explicit View(std::shared_ptr sd, unsigned int width, unsigned int height, RenderBackend::ViewId vid); /// not available View& operator=(const View&); @@ -481,7 +481,7 @@ class View * @param bsl Block serial numbers to skip. * @param fs First block to start with checking with serial number. */ - void SetNextRectangle(TaskQueue& taskq, shared_ptr bsl, unsigned int fs); + void SetNextRectangle(TaskQueue& taskq, std::shared_ptr bsl, unsigned int fs); /** * Thread controlling the render task queue. diff --git a/source/backend/support/randomsequences.cpp b/source/backend/support/randomsequences.cpp index d4ec8d7e8..24e623ade 100644 --- a/source/backend/support/randomsequences.cpp +++ b/source/backend/support/randomsequences.cpp @@ -229,7 +229,7 @@ class HybridNumberGenerator : public SeedableNumberGenerator, public Index HybridNumberGenerator(size_t size = 0); virtual Type operator()(); - virtual shared_ptr > GetSequence(size_t count); + virtual std::shared_ptr > GetSequence(size_t count); virtual size_t MaxIndex() const; virtual size_t CycleLength() const; virtual void Seed(size_t seed); @@ -350,8 +350,8 @@ class Halton2dBasedGenerator : public HybridNumberGenerator protected: - shared_ptr generatorA; - shared_ptr generatorB; + std::shared_ptr generatorA; + std::shared_ptr generatorB; }; /** @@ -426,22 +426,22 @@ class NumberSequenceFactory public: /// Sets up the factory to use a given sequence. - NumberSequenceFactory(shared_ptr const> masterSequence); + NumberSequenceFactory(std::shared_ptr const> masterSequence); /// Sets up the factory to use a given number source. - NumberSequenceFactory(shared_ptr > master); + NumberSequenceFactory(std::shared_ptr > master); /// Sets up the factory to use a given number source, pre-computing a given number of elements. - NumberSequenceFactory(shared_ptr > master, size_t count); + NumberSequenceFactory(std::shared_ptr > master, size_t count); /// Gets a reference to a table of pre-computed numbers having at least the given size. /// @note The vector returned may contain more elements than requested. - shared_ptr const> operator()(size_t count); + std::shared_ptr const> operator()(size_t count); protected: typedef SequentialNumberGenerator Generator; - typedef shared_ptr GeneratorPtr; + typedef std::shared_ptr GeneratorPtr; typedef vector Sequence; - typedef shared_ptr SequencePtr; - typedef shared_ptr SequenceConstPtr; + typedef std::shared_ptr SequencePtr; + typedef std::shared_ptr SequenceConstPtr; GeneratorPtr master; SequenceConstPtr masterSequence; @@ -461,12 +461,12 @@ class NumberSequenceMetaFactory { public: - static shared_ptr > GetFactory(const typename GeneratorType::ParameterStruct& param); + static std::shared_ptr > GetFactory(const typename GeneratorType::ParameterStruct& param); protected: typedef NumberSequenceFactory Factory; - typedef shared_ptr FactoryPtr; + typedef std::shared_ptr FactoryPtr; typedef weak_ptr FactoryWeakPtr; typedef std::map FactoryTable; @@ -493,7 +493,7 @@ class PrecomputedNumberGenerator : public HybridNumberGenerator public: /// Construct from a sequence factory. - PrecomputedNumberGenerator(shared_ptr > master, size_t size) : + PrecomputedNumberGenerator(std::shared_ptr > master, size_t size) : HybridNumberGenerator(size), values((*master)(size)) {} @@ -506,11 +506,11 @@ class PrecomputedNumberGenerator : public HybridNumberGenerator return (*values)[i % size]; } /// Returns a particular subset from the sequence. - virtual shared_ptr > GetSequence(size_t index, size_t count) const + virtual std::shared_ptr > GetSequence(size_t index, size_t count) const { // According to C++ standard, template classes cannot refer to parent template classes' members by unqualified name const size_t& size = HybridNumberGenerator::size; - shared_ptr > data(new vector); + std::shared_ptr > data(new vector); data->reserve(count); size_t i = index % size; while (count >= size - i) // handle wrap-around @@ -525,7 +525,7 @@ class PrecomputedNumberGenerator : public HybridNumberGenerator protected: - shared_ptr const> values; + std::shared_ptr const> values; }; typedef PrecomputedNumberGenerator PrecomputedIntGenerator; @@ -554,9 +554,9 @@ Type HybridNumberGenerator::operator()() } template -shared_ptr > HybridNumberGenerator::GetSequence(size_t count) +std::shared_ptr > HybridNumberGenerator::GetSequence(size_t count) { - shared_ptr > data(IndexedNumberGenerator::GetSequence(index, count)); + std::shared_ptr > data(IndexedNumberGenerator::GetSequence(index, count)); index += count; if (size != 0) index = index % size; @@ -685,24 +685,24 @@ double HaltonGenerator::operator[](size_t index) const *********************************************************************************/ template -NumberSequenceFactory::NumberSequenceFactory(shared_ptr const> masterSequence) : +NumberSequenceFactory::NumberSequenceFactory(std::shared_ptr const> masterSequence) : masterSequence(masterSequence) {} template -NumberSequenceFactory::NumberSequenceFactory(shared_ptr > master) : +NumberSequenceFactory::NumberSequenceFactory(std::shared_ptr > master) : master(master) {} template -NumberSequenceFactory::NumberSequenceFactory(shared_ptr > master, size_t count) : +NumberSequenceFactory::NumberSequenceFactory(std::shared_ptr > master, size_t count) : master(master) { (*this)(count); // force initial sequence to be generated } template -shared_ptr const> NumberSequenceFactory::operator()(size_t count) +std::shared_ptr const> NumberSequenceFactory::operator()(size_t count) { boost::mutex::scoped_lock lock(masterMutex); if (!masterSequence) @@ -748,7 +748,7 @@ template boost::mutex NumberSequenceMetaFactory::lookupMutex; template -shared_ptr > NumberSequenceMetaFactory::GetFactory(const typename GeneratorType::ParameterStruct& param) +std::shared_ptr > NumberSequenceMetaFactory::GetFactory(const typename GeneratorType::ParameterStruct& param) { boost::mutex::scoped_lock lock(lookupMutex); if (!lookupTable) @@ -756,8 +756,8 @@ shared_ptr > NumberSequenceMetaFactory masterGenerator(new GeneratorType(param)); - factory = FactoryPtr(new Factory(shared_ptr >(masterGenerator))); + std::shared_ptr masterGenerator(new GeneratorType(param)); + factory = FactoryPtr(new Factory(std::shared_ptr >(masterGenerator))); (*lookupTable)[param] = factory; } return factory; @@ -913,7 +913,7 @@ SeedableIntGeneratorPtr GetRandomIntGenerator(int minval, int maxval, size_t cou { assert (count > 0); Mt19937IntGenerator::ParameterStruct param(minval, maxval); - shared_ptr > factory = Mt19937IntMetaFactory::GetFactory(param); + std::shared_ptr > factory = Mt19937IntMetaFactory::GetFactory(param); SeedableIntGeneratorPtr generator(new PrecomputedIntGenerator(factory, count)); (void)(*generator)(); // legacy fix return generator; @@ -923,7 +923,7 @@ SeedableDoubleGeneratorPtr GetRandomDoubleGenerator(double minval, double maxval { assert (count > 0); Mt19937DoubleGenerator::ParameterStruct param(minval, maxval); - shared_ptr > factory(Mt19937DoubleMetaFactory::GetFactory(param)); + std::shared_ptr > factory(Mt19937DoubleMetaFactory::GetFactory(param)); SeedableDoubleGeneratorPtr generator(new PrecomputedDoubleGenerator(factory, count)); (void)(*generator)(); // legacy fix return generator; @@ -941,7 +941,7 @@ IndexedDoubleGeneratorPtr GetIndexedRandomDoubleGenerator(double minval, double { assert (count > 0); Mt19937DoubleGenerator::ParameterStruct param(minval, maxval); - shared_ptr > factory(Mt19937DoubleMetaFactory::GetFactory(param)); + std::shared_ptr > factory(Mt19937DoubleMetaFactory::GetFactory(param)); return IndexedDoubleGeneratorPtr(new PrecomputedDoubleGenerator(factory, count)); } @@ -950,7 +950,7 @@ SequentialVectorGeneratorPtr GetSubRandomCosWeightedDirectionGenerator(unsigned if ((id == 0) && count && (count < LegacyCosWeightedDirectionGenerator::NumEntries)) { LegacyCosWeightedDirectionGenerator::ParameterStruct param; - shared_ptr > factory(LegacyCosWeightedDirectionMetaFactory::GetFactory(param)); + std::shared_ptr > factory(LegacyCosWeightedDirectionMetaFactory::GetFactory(param)); return SequentialVectorGeneratorPtr(new PrecomputedVectorGenerator(factory, count)); } else @@ -958,7 +958,7 @@ SequentialVectorGeneratorPtr GetSubRandomCosWeightedDirectionGenerator(unsigned HaltonCosWeightedDirectionGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], primeTable[(id+1) % PRIME_TABLE_COUNT]); if (count) { - shared_ptr > factory(HaltonCosWeightedDirectionMetaFactory::GetFactory(param)); + std::shared_ptr > factory(HaltonCosWeightedDirectionMetaFactory::GetFactory(param)); return SequentialVectorGeneratorPtr(new PrecomputedVectorGenerator(factory, count)); } else @@ -971,7 +971,7 @@ SequentialDoubleGeneratorPtr GetSubRandomDoubleGenerator(unsigned int id, double HaltonDoubleGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], minval, maxval); if (count) { - shared_ptr > factory(HaltonUniformDoubleMetaFactory::GetFactory(param)); + std::shared_ptr > factory(HaltonUniformDoubleMetaFactory::GetFactory(param)); return SequentialDoubleGeneratorPtr(new PrecomputedDoubleGenerator(factory, count)); } else @@ -983,7 +983,7 @@ SequentialVectorGeneratorPtr GetSubRandomDirectionGenerator(unsigned int id, siz HaltonUniformDirectionGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], primeTable[(id+1) % PRIME_TABLE_COUNT]); if (count) { - shared_ptr > factory(HaltonUniformDirectionMetaFactory::GetFactory(param)); + std::shared_ptr > factory(HaltonUniformDirectionMetaFactory::GetFactory(param)); return SequentialVectorGeneratorPtr(new PrecomputedVectorGenerator(factory, count)); } else @@ -995,7 +995,7 @@ SequentialVector2dGeneratorPtr GetSubRandomOnDiscGenerator(unsigned int id, doub HaltonOnDiscGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], primeTable[(id+1) % PRIME_TABLE_COUNT], radius); if (count) { - shared_ptr > factory(HaltonOnDiscMetaFactory::GetFactory(param)); + std::shared_ptr > factory(HaltonOnDiscMetaFactory::GetFactory(param)); return SequentialVector2dGeneratorPtr(new PrecomputedVector2dGenerator(factory, count)); } else @@ -1007,7 +1007,7 @@ SequentialVector2dGeneratorPtr GetSubRandom2dGenerator(unsigned int id, double m Halton2dGenerator::ParameterStruct param(primeTable[id % PRIME_TABLE_COUNT], primeTable[(id+1) % PRIME_TABLE_COUNT], minX, maxX, minY, maxY); if (count) { - shared_ptr > factory(Halton2dMetaFactory::GetFactory(param)); + std::shared_ptr > factory(Halton2dMetaFactory::GetFactory(param)); return SequentialVector2dGeneratorPtr(new PrecomputedVector2dGenerator(factory, count)); } else diff --git a/source/backend/support/randomsequences.h b/source/backend/support/randomsequences.h index 1889cc356..9aa758e77 100644 --- a/source/backend/support/randomsequences.h +++ b/source/backend/support/randomsequences.h @@ -118,9 +118,9 @@ class SequentialNumberGenerator /// Returns the next number from the sequence. virtual Type operator()() = 0; /// Returns the next N numbers from the sequence. - virtual shared_ptr > GetSequence(size_t count) + virtual std::shared_ptr > GetSequence(size_t count) { - shared_ptr > data(new vector); + std::shared_ptr > data(new vector); data->reserve(count); for (size_t i = 0; i < count; i ++) data->push_back((*this)()); @@ -147,9 +147,9 @@ class IndexedNumberGenerator /// Returns a particular number from the sequence. virtual Type operator[](size_t index) const = 0; /// Returns a particular subsequence from the sequence. - virtual shared_ptr > GetSequence(size_t index, size_t count) const + virtual std::shared_ptr > GetSequence(size_t index, size_t count) const { - shared_ptr > data(new vector); + std::shared_ptr > data(new vector); data->reserve(count); for (size_t i = 0; i < count; i ++) data->push_back((*this)[index + i]); @@ -172,20 +172,20 @@ class IndexedNumberGenerator * @{ */ -typedef shared_ptr > SequentialIntGeneratorPtr; -typedef shared_ptr > SequentialDoubleGeneratorPtr; -typedef shared_ptr > SequentialVectorGeneratorPtr; -typedef shared_ptr > SequentialVector2dGeneratorPtr; +typedef std::shared_ptr > SequentialIntGeneratorPtr; +typedef std::shared_ptr > SequentialDoubleGeneratorPtr; +typedef std::shared_ptr > SequentialVectorGeneratorPtr; +typedef std::shared_ptr > SequentialVector2dGeneratorPtr; -typedef shared_ptr > SeedableIntGeneratorPtr; -typedef shared_ptr > SeedableDoubleGeneratorPtr; -typedef shared_ptr > SeedableVectorGeneratorPtr; -typedef shared_ptr > SeedableVector2dGeneratorPtr; +typedef std::shared_ptr > SeedableIntGeneratorPtr; +typedef std::shared_ptr > SeedableDoubleGeneratorPtr; +typedef std::shared_ptr > SeedableVectorGeneratorPtr; +typedef std::shared_ptr > SeedableVector2dGeneratorPtr; -typedef shared_ptr const> IndexedIntGeneratorPtr; -typedef shared_ptr const> IndexedDoubleGeneratorPtr; -typedef shared_ptr const> IndexedVectorGeneratorPtr; -typedef shared_ptr const> IndexedVector2dGeneratorPtr; +typedef std::shared_ptr const> IndexedIntGeneratorPtr; +typedef std::shared_ptr const> IndexedDoubleGeneratorPtr; +typedef std::shared_ptr const> IndexedVectorGeneratorPtr; +typedef std::shared_ptr const> IndexedVector2dGeneratorPtr; /** * @} diff --git a/source/backend/support/task.cpp b/source/backend/support/task.cpp index 9eabfb335..0fa2bab69 100644 --- a/source/backend/support/task.cpp +++ b/source/backend/support/task.cpp @@ -109,9 +109,9 @@ void Task::Start(const boost::function0& completion) { if((done == false) && (taskThread == NULL)) #ifndef USE_OFFICIAL_BOOST - taskThread = new boost::thread(boost::bind(&Task::TaskThread, this, completion), 1024 * 1024 * 2); // TODO - make stack size definable + taskThread = new boost::thread(std::bind(&Task::TaskThread, this, completion), 1024 * 1024 * 2); // TODO - make stack size definable #else - taskThread = new boost::thread(boost::bind(&Task::TaskThread, this, completion)); + taskThread = new boost::thread(std::bind(&Task::TaskThread, this, completion)); #endif } @@ -260,7 +260,7 @@ void Task::TaskThread(const boost::function0& completion) } -SceneTask::SceneTask(TaskData *td, const boost::function1& f, const char* sn, shared_ptr sd, RenderBackend::ViewId vid) : +SceneTask::SceneTask(TaskData *td, const boost::function1& f, const char* sn, std::shared_ptr sd, RenderBackend::ViewId vid) : Task(td, f), messageFactory(sd->warningLevel, sn, sd->backendAddress, sd->frontendAddress, sd->sceneId, vid) {} diff --git a/source/backend/support/task.h b/source/backend/support/task.h index d23913798..0d2fa2e6b 100644 --- a/source/backend/support/task.h +++ b/source/backend/support/task.h @@ -183,7 +183,7 @@ class Task class SceneTask : public Task { public: - SceneTask(TaskData *td, const boost::function1& f, const char* sn, shared_ptr sd, RenderBackend::ViewId vid = 0); + SceneTask(TaskData *td, const boost::function1& f, const char* sn, std::shared_ptr sd, RenderBackend::ViewId vid = 0); protected: MessageFactory messageFactory; diff --git a/source/backend/support/taskqueue.cpp b/source/backend/support/taskqueue.cpp index 75ac81fdb..281782b82 100644 --- a/source/backend/support/taskqueue.cpp +++ b/source/backend/support/taskqueue.cpp @@ -156,7 +156,7 @@ Task::TaskData *TaskQueue::AppendTask(Task *task) failed = false; - queuedTasks.push(TaskEntry(shared_ptr(task))); + queuedTasks.push(TaskEntry(std::shared_ptr(task))); Notify(); @@ -222,7 +222,7 @@ bool TaskQueue::Process() case TaskEntry::kTask: { activeTasks.push_back(queuedTasks.front()); - queuedTasks.front().GetTask()->Start(boost::bind(&TaskQueue::Notify, this)); + queuedTasks.front().GetTask()->Start(std::bind(&TaskQueue::Notify, this)); queuedTasks.pop(); break; } diff --git a/source/backend/support/taskqueue.h b/source/backend/support/taskqueue.h index 03ef68566..3e4b024b3 100644 --- a/source/backend/support/taskqueue.h +++ b/source/backend/support/taskqueue.h @@ -60,19 +60,19 @@ class TaskQueue }; TaskEntry(EntryType et) : entryType(et) { } - TaskEntry(shared_ptr rt) : entryType(kTask), task(rt) { } + TaskEntry(std::shared_ptr rt) : entryType(kTask), task(rt) { } TaskEntry(POVMS_Message& m) : entryType(kMessage), msg(m) { } TaskEntry(const boost::function1& f) : entryType(kFunction), fn(f) { } ~TaskEntry() { } - shared_ptr GetTask() { return task; } + std::shared_ptr GetTask() { return task; } POVMS_Message& GetMessage() { return msg; } boost::function1& GetFunction() { return fn; } EntryType GetEntryType() { return entryType; } private: EntryType entryType; - shared_ptr task; + std::shared_ptr task; POVMS_Message msg; boost::function1 fn; }; diff --git a/source/base/build.h b/source/base/build.h index 768895396..91b646850 100644 --- a/source/base/build.h +++ b/source/base/build.h @@ -46,8 +46,7 @@ #ifndef BUILT_BY /// Specifies the person or organization responsible for this build. /// @attention Please set this to your real name, and/or include a working email or website address to contact you. -#define BUILT_BY "YOUR NAME (YOUR EMAIL)" -#error Please fill in BUILT_BY, then remove this line +#define BUILT_BY "Stefan de Bruijn (atlaste@yahoo.com)" #endif #endif // POVRAY_BASE_BUILD_H diff --git a/source/base/image/colourspace.cpp b/source/base/image/colourspace.cpp index c50ff012f..facdb5f7a 100644 --- a/source/base/image/colourspace.cpp +++ b/source/base/image/colourspace.cpp @@ -116,7 +116,7 @@ GammaCurvePtr GammaCurve::GetMatching(const GammaCurvePtr& newInstance) else if (oldInstance->Matches(newInstance)) { // Found a matching curve in the cache, so use that instead, and (as far as we're concerned) - // just forget that the new instance ever existed (allowing the shared_ptr mechanism to garbage-collect it) + // just forget that the new instance ever existed (allowing the std::shared_ptr mechanism to garbage-collect it) return oldInstance; } } diff --git a/source/base/image/colourspace.h b/source/base/image/colourspace.h index 7ff5d11e7..2b8e6457a 100644 --- a/source/base/image/colourspace.h +++ b/source/base/image/colourspace.h @@ -51,10 +51,10 @@ class GammaCurve; class SimpleGammaCurve; /// Class holding a shared reference to a gamma curve. -typedef shared_ptr GammaCurvePtr; +typedef std::shared_ptr GammaCurvePtr; /// Class holding a shared reference to a simple gamma curve. -typedef shared_ptr SimpleGammaCurvePtr; +typedef std::shared_ptr SimpleGammaCurvePtr; /// Abstract class representing an encoding gamma curve (or, more generally, transfer function). /// diff --git a/source/base/image/encoding.h b/source/base/image/encoding.h index 3e71ec04d..fe0643d1d 100644 --- a/source/base/image/encoding.h +++ b/source/base/image/encoding.h @@ -95,7 +95,7 @@ class DitherHandler virtual void setError(unsigned int x, unsigned int y, const OffsetInfo& err) {} }; -typedef shared_ptr DitherHandlerPtr; +typedef std::shared_ptr DitherHandlerPtr; /// //***************************************************************************** diff --git a/source/base/types.h b/source/base/types.h index 13ac44ca5..1b3241a1a 100644 --- a/source/base/types.h +++ b/source/base/types.h @@ -39,6 +39,7 @@ #include #include #include +#include #include "base/configbase.h" diff --git a/source/frontend/imageprocessing.cpp b/source/frontend/imageprocessing.cpp index ac78411a3..da70a9937 100644 --- a/source/frontend/imageprocessing.cpp +++ b/source/frontend/imageprocessing.cpp @@ -64,7 +64,7 @@ enum ImageProcessing::ImageProcessing(unsigned int width, unsigned int height) { - image = shared_ptr(Image::Create(width, height, Image::RGBFT_Float)); + image = std::shared_ptr(Image::Create(width, height, Image::RGBFT_Float)); toStderr = toStdout = false; // TODO FIXME - find a better place for this @@ -78,7 +78,7 @@ ImageProcessing::ImageProcessing(POVMS_Object& ropts) unsigned int blockSize(ropts.TryGetInt(kPOVAttrib_RenderBlockSize, 32)); unsigned int maxBufferMem(ropts.TryGetInt(kPOVAttrib_MaxImageBufferMem, 128)); // number is megabytes - image = shared_ptr(Image::Create(width, height, Image::RGBFT_Float, maxBufferMem, blockSize * blockSize)); + image = std::shared_ptr(Image::Create(width, height, Image::RGBFT_Float, maxBufferMem, blockSize * blockSize)); toStdout = OutputIsStdout(ropts); toStderr = OutputIsStderr(ropts); @@ -86,7 +86,7 @@ ImageProcessing::ImageProcessing(POVMS_Object& ropts) image->SetPremultiplied(true); // POV-Ray uses premultiplied opacity for its math, so that's what will end up in the image container } -ImageProcessing::ImageProcessing(shared_ptr& img) +ImageProcessing::ImageProcessing(std::shared_ptr& img) { image = img; toStderr = toStdout = false; @@ -189,7 +189,7 @@ UCS2String ImageProcessing::WriteImage(POVMS_Object& ropts, POVMSInt frame, int return UCS2String(); } -shared_ptr& ImageProcessing::GetImage() +std::shared_ptr& ImageProcessing::GetImage() { return image; } diff --git a/source/frontend/imageprocessing.h b/source/frontend/imageprocessing.h index 839598fd8..02ee62aee 100644 --- a/source/frontend/imageprocessing.h +++ b/source/frontend/imageprocessing.h @@ -59,12 +59,12 @@ class ImageProcessing public: ImageProcessing(unsigned int width, unsigned int height); ImageProcessing(POVMS_Object& ropts); - ImageProcessing(shared_ptr& img); + ImageProcessing(std::shared_ptr& img); virtual ~ImageProcessing(); UCS2String WriteImage(POVMS_Object& ropts, POVMSInt frame = 0, int digits = 0); - shared_ptr& GetImage(); + std::shared_ptr& GetImage(); UCS2String GetOutputFilename(POVMS_Object& ropts, POVMSInt frame, int digits); bool OutputIsStdout(void) { return toStdout; } @@ -73,7 +73,7 @@ class ImageProcessing virtual bool OutputIsStderr(POVMS_Object& ropts); protected: - shared_ptr image; + std::shared_ptr image; bool toStdout; bool toStderr; diff --git a/source/frontend/renderfrontend.cpp b/source/frontend/renderfrontend.cpp index 36b590f98..ef9891865 100644 --- a/source/frontend/renderfrontend.cpp +++ b/source/frontend/renderfrontend.cpp @@ -147,7 +147,7 @@ RenderFrontendBase::~RenderFrontendBase() // nothing to do } -void RenderFrontendBase::ConnectToBackend(POVMSAddress backendaddress, POVMS_Object& obj, POVMS_Object *resultobj, shared_ptr& console) +void RenderFrontendBase::ConnectToBackend(POVMSAddress backendaddress, POVMS_Object& obj, POVMS_Object *resultobj, std::shared_ptr& console) { POVMS_Message msg(obj, kPOVMsgClass_BackendControl, kPOVMsgIdent_InitInfo); POVMS_Message result(kPOVObjectClass_ResultData); @@ -609,7 +609,7 @@ void RenderFrontendBase::NewBackup(POVMS_Object& ropts, ViewData& vd, const Path MakeBackupPath(ropts, vd, outputpath); if(POV_ALLOW_FILE_WRITE(vd.imageBackupFile().c_str(), POV_File_Data_Backup) == false) throw POV_EXCEPTION(kCannotOpenFileErr, "Permission denied to create render state output file."); - vd.imageBackup = shared_ptr(POV_PLATFORM_BASE.CreateOStream(POV_File_Data_Backup)); + vd.imageBackup = std::shared_ptr(POV_PLATFORM_BASE.CreateOStream(POV_File_Data_Backup)); if(vd.imageBackup != NULL) { Backup_File_Header hdr; @@ -724,7 +724,7 @@ void RenderFrontendBase::ContinueBackup(POVMS_Object& ropts, ViewData& vd, ViewI // if there isn't going to be an output file, we don't write to the state file if(outputToFile == true) { - vd.imageBackup = shared_ptr(POV_PLATFORM_BASE.CreateOStream(POV_File_Data_Backup)); + vd.imageBackup = std::shared_ptr(POV_PLATFORM_BASE.CreateOStream(POV_File_Data_Backup)); if(vd.imageBackup != NULL) { if(vd.imageBackup->open(vd.imageBackupFile().c_str(), IOBase::append) == false) diff --git a/source/frontend/renderfrontend.h b/source/frontend/renderfrontend.h index bfa699ad4..fea84ee4f 100644 --- a/source/frontend/renderfrontend.h +++ b/source/frontend/renderfrontend.h @@ -97,7 +97,7 @@ struct SceneData SceneState state; - mutable shared_ptr console; + mutable std::shared_ptr console; mutable list readfiles; mutable list createdfiles; @@ -107,7 +107,7 @@ struct SceneData list searchpaths; - shared_ptr streams[MAX_STREAMS]; + std::shared_ptr streams[MAX_STREAMS]; UCS2String streamnames[MAX_STREAMS]; bool consoleoutput[MAX_STREAMS]; @@ -140,9 +140,9 @@ struct ViewData ViewState state; - mutable shared_ptr image; - mutable shared_ptr display; - mutable shared_ptr imageBackup; + mutable std::shared_ptr image; + mutable std::shared_ptr display; + mutable std::shared_ptr imageBackup; Path imageBackupFile; }; @@ -223,12 +223,12 @@ class RenderFrontendBase : public POVMS_MessageReceiver RenderFrontendBase(POVMSContext); virtual ~RenderFrontendBase(); - void ConnectToBackend(POVMSAddress, POVMS_Object&, POVMS_Object *, shared_ptr&); + void ConnectToBackend(POVMSAddress, POVMS_Object&, POVMS_Object *, std::shared_ptr&); void DisconnectFromBackend(POVMSAddress); - virtual shared_ptr GetConsole(SceneId) = 0; - virtual shared_ptr GetImage(ViewId) = 0; - virtual shared_ptr GetDisplay(ViewId) = 0; + virtual std::shared_ptr GetConsole(SceneId) = 0; + virtual std::shared_ptr GetImage(ViewId) = 0; + virtual std::shared_ptr GetDisplay(ViewId) = 0; protected: typedef std::set BackendAddressSet; @@ -298,7 +298,7 @@ class RenderFrontend : public RenderFrontendBase void ResumeParser(SceneId sid); void StopParser(SceneId sid); - ViewId CreateView(SceneId sid, POVMS_Object& obj, shared_ptr& imageProcessing, boost::function fn); + ViewId CreateView(SceneId sid, POVMS_Object& obj, std::shared_ptr& imageProcessing, boost::function fn); void CloseView(ViewId vid); ViewData::ViewState GetViewState(ViewId vid); @@ -308,9 +308,9 @@ class RenderFrontend : public RenderFrontendBase void ResumeRender(ViewId vid); void StopRender(ViewId vid); - virtual shared_ptr GetConsole(SceneId sid); - virtual shared_ptr GetImage(ViewId vid); - virtual shared_ptr GetDisplay(ViewId vid); + virtual std::shared_ptr GetConsole(SceneId sid); + virtual std::shared_ptr GetImage(ViewId vid); + virtual std::shared_ptr GetDisplay(ViewId vid); protected: virtual void HandleParserMessage(SceneId sid, POVMSType ident, POVMS_Object& msg); virtual void HandleFileMessage(SceneId sid, POVMSType ident, POVMS_Object& msg, POVMS_Object& result); @@ -357,7 +357,7 @@ RenderFrontendBase::SceneId RenderFrontend(fn()); + sh.data.console = std::shared_ptr(fn()); scenehandler[sid] = sh; scene2views[sid] = ViewIdSet(); @@ -447,7 +447,7 @@ void RenderFrontend::StopParser(SceneId } template -RenderFrontendBase::ViewId RenderFrontend::CreateView(SceneId sid, POVMS_Object& obj, shared_ptr& imageProcessing, boost::function fn) +RenderFrontendBase::ViewId RenderFrontend::CreateView(SceneId sid, POVMS_Object& obj, std::shared_ptr& imageProcessing, boost::function fn) { typename SceneHandlerMap::iterator shi(scenehandler.find(sid)); @@ -543,7 +543,7 @@ RenderFrontendBase::ViewId RenderFrontend img(imageProcessing->GetImage()); + std::shared_ptr img(imageProcessing->GetImage()); if(img != NULL) { if((img->GetWidth() != width) || (img->GetHeight() != height)) @@ -552,11 +552,11 @@ RenderFrontendBase::ViewId RenderFrontend(Image::Create(width, height, Image::RGBFT_Float)); + vh.data.image = std::shared_ptr(Image::Create(width, height, Image::RGBFT_Float)); } if(obj.TryGetBool(kPOVAttrib_Display, true) == true) - vh.data.display = shared_ptr(fn(width, height, gamma)); + vh.data.display = std::shared_ptr(fn(width, height, gamma)); viewhandler[vid] = vh; view2scene[vid] = sid; @@ -730,33 +730,33 @@ void RenderFrontend::StopRender(ViewId } template -shared_ptr RenderFrontend::GetConsole(SceneId sid) +std::shared_ptr RenderFrontend::GetConsole(SceneId sid) { typename SceneHandlerMap::iterator shi(scenehandler.find(sid)); if(shi != scenehandler.end()) return shi->second.data.console; else - return shared_ptr(); + return std::shared_ptr(); } template -shared_ptr RenderFrontend::GetImage(ViewId vid) +std::shared_ptr RenderFrontend::GetImage(ViewId vid) { typename ViewHandlerMap::iterator vhi(viewhandler.find(vid)); if(vhi != viewhandler.end()) return vhi->second.data.image; else - return shared_ptr(); + return std::shared_ptr(); } template -shared_ptr RenderFrontend::GetDisplay(ViewId vid) +std::shared_ptr RenderFrontend::GetDisplay(ViewId vid) { typename ViewHandlerMap::iterator vhi(viewhandler.find(vid)); if(vhi != viewhandler.end()) return vhi->second.data.display; else - return shared_ptr(); + return std::shared_ptr(); } template diff --git a/source/frontend/shelloutprocessing.h b/source/frontend/shelloutprocessing.h index f6f094af1..04f62d032 100644 --- a/source/frontend/shelloutprocessing.h +++ b/source/frontend/shelloutprocessing.h @@ -90,7 +90,7 @@ class ShelloutProcessing friend class ShelloutAction; public: - typedef shared_ptr ShelloutPtr; + typedef std::shared_ptr ShelloutPtr; typedef enum { diff --git a/source/frontend/simplefrontend.h b/source/frontend/simplefrontend.h index 3b4e4b3ee..5a5b33641 100644 --- a/source/frontend/simplefrontend.h +++ b/source/frontend/simplefrontend.h @@ -77,10 +77,10 @@ class SimpleFrontend SimpleFrontend(POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, boost::function cfn, boost::function dfn, - POVMS_Object *result = NULL, shared_ptr console = shared_ptr()); + POVMS_Object *result = NULL, std::shared_ptr console = std::shared_ptr()); ~SimpleFrontend(); - bool Start(POVMS_Object& opts, shared_ptr img = shared_ptr()); + bool Start(POVMS_Object& opts, std::shared_ptr img = std::shared_ptr()); bool Stop(); bool Pause(); bool Resume(); @@ -89,9 +89,9 @@ class SimpleFrontend State GetState() const; - shared_ptr GetConsole(); - shared_ptr GetImage(); - shared_ptr GetDisplay(); + std::shared_ptr GetConsole(); + std::shared_ptr GetImage(); + std::shared_ptr GetDisplay(); private: RenderFrontend renderFrontend; POVMSAddress backendAddress; @@ -99,9 +99,9 @@ class SimpleFrontend POVMS_Object options; RenderFrontendBase::SceneId sceneId; RenderFrontendBase::ViewId viewId; - shared_ptr imageProcessing; - shared_ptr animationProcessing; - shared_ptr shelloutProcessing; + std::shared_ptr imageProcessing; + std::shared_ptr animationProcessing; + std::shared_ptr shelloutProcessing; boost::function createConsole; boost::function createDisplay; }; @@ -110,7 +110,7 @@ template SimpleFrontend::SimpleFrontend(POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, boost::function cfn, boost::function dfn, - POVMS_Object *result, shared_ptr console) : + POVMS_Object *result, std::shared_ptr console) : renderFrontend(ctx), backendAddress(addr), state(kReady), @@ -128,7 +128,7 @@ SimpleFrontend::~SimpleFrontend() } template -bool SimpleFrontend::Start(POVMS_Object& opts, shared_ptr img) +bool SimpleFrontend::Start(POVMS_Object& opts, std::shared_ptr img) { int width; int height; @@ -155,16 +155,16 @@ bool SimpleFrontend::Start(POVMS_Object opts.Set(kPOVAttrib_Declare, declares); if(opts.TryGetInt(kPOVAttrib_FinalFrame, 0) > 0) - animationProcessing = shared_ptr(new AnimationProcessing(opts)); + animationProcessing = std::shared_ptr(new AnimationProcessing(opts)); options = opts; if(opts.TryGetBool(kPOVAttrib_OutputToFile, true)) { if(img != NULL) - imageProcessing = shared_ptr(new ImageProcessing(img)); + imageProcessing = std::shared_ptr(new ImageProcessing(img)); else - imageProcessing = shared_ptr(new ImageProcessing(options)); + imageProcessing = std::shared_ptr(new ImageProcessing(options)); } Path ip (opts.TryGetString(kPOVAttrib_InputFile, "")); @@ -436,19 +436,19 @@ State SimpleFrontend::GetState() const } template -shared_ptr SimpleFrontend::GetConsole() +std::shared_ptr SimpleFrontend::GetConsole() { return renderFrontend.GetConsole(sceneId); } template -shared_ptr SimpleFrontend::GetImage() +std::shared_ptr SimpleFrontend::GetImage() { return renderFrontend.GetImage(viewId); } template -shared_ptr SimpleFrontend::GetDisplay() +std::shared_ptr SimpleFrontend::GetDisplay() { return renderFrontend.GetDisplay(viewId); } diff --git a/source/parser/parser.cpp b/source/parser/parser.cpp index bff1e8fa4..94449be07 100644 --- a/source/parser/parser.cpp +++ b/source/parser/parser.cpp @@ -133,7 +133,7 @@ const DBL INFINITE_VOLUME = BOUND_HUGE; ******************************************************************************/ Parser::Parser(shared_ptr sd, bool useclk, DBL clk) : - SceneTask(new TraceThreadData(sd), boost::bind(&Parser::SendFatalError, this, _1), "Parse", sd), +SceneTask(new TraceThreadData(sd), std::bind(&Parser::SendFatalError, this, std::placeholders::_1), "Parse", sd), sceneData(sd), clockValue(clk), useClock(useclk), @@ -1383,11 +1383,18 @@ void Parser::Parse_Camera (Camera& Cam) old_angle = New.Angle; New.Angle = HUGE_VAL; - EXPECT + New.Zero_Parallax = 2.5; + New.Eye_Offset = 0.5/30.0; + + EXPECT CASE (PERSPECTIVE_TOKEN) New.Type = PERSPECTIVE_CAMERA; END_CASE + CASE(STEREOSCOPIC_TOKEN) + New.Type = STEREOSCOPIC_CAMERA; + END_CASE + CASE (ORTHOGRAPHIC_TOKEN) New.Type = ORTHOGRAPHIC_CAMERA; END_CASE @@ -1456,6 +1463,26 @@ void Parser::Parse_Camera (Camera& Cam) EXIT END_CASE END_EXPECT + break; + case STEREOSCOPIC_CAMERA: + EXPECT + CASE (ANGLE_TOKEN) + New.Angle = Parse_Float(); + if (New.Angle < 0.0) + Error("Negative viewing angle."); + END_CASE + + CASE5(ORTHOGRAPHIC_TOKEN, FISHEYE_TOKEN, ULTRA_WIDE_ANGLE_TOKEN, OMNIMAX_TOKEN, PANORAMIC_TOKEN) + CASE2(SPHERICAL_TOKEN, CYLINDER_TOKEN) + Expectation_Error("perspective camera modifier"); + END_CASE + + OTHERWISE + UNGET + if(Parse_Camera_Mods(New) == false) + EXIT + END_CASE + END_EXPECT break; case ORTHOGRAPHIC_CAMERA: EXPECT @@ -1639,7 +1666,7 @@ void Parser::Parse_Camera (Camera& Cam) // apply "angle" if (New.Angle != HUGE_VAL) { - if ((New.Type == PERSPECTIVE_CAMERA) || (New.Type == ORTHOGRAPHIC_CAMERA)) + if ((New.Type == PERSPECTIVE_CAMERA) || (New.Type == ORTHOGRAPHIC_CAMERA) || (New.Type == STEREOSCOPIC_CAMERA)) { if (New.Angle >= 180.0) Error("Viewing angle has to be smaller than 180 degrees."); @@ -1749,6 +1776,10 @@ void Parser::Parse_Camera (Camera& Cam) New.Type = PERSPECTIVE_CAMERA; END_CASE + CASE (STEREOSCOPIC_TOKEN) + New.Type = STEREOSCOPIC_CAMERA; + END_CASE + CASE (ORTHOGRAPHIC_TOKEN) New.Type = ORTHOGRAPHIC_CAMERA; // resize right and up vector to get the same image @@ -1800,7 +1831,7 @@ void Parser::Parse_Camera (Camera& Cam) if (New.Angle < 0.0) Error("Negative viewing angle."); - if (New.Type == PERSPECTIVE_CAMERA) + if (New.Type == PERSPECTIVE_CAMERA || New.Type == STEREOSCOPIC_CAMERA) { if (New.Angle >= 180.0) Error("Viewing angle has to be smaller than 180 degrees."); @@ -2077,6 +2108,14 @@ bool Parser::Parse_Camera_Mods(Camera& New) Parse_Vector(New.Focal_Point); END_CASE + CASE(EYEOFFSET_TOKEN) + New.Eye_Offset = Parse_Float(); + END_CASE + + CASE(ZEROPARALLAX_TOKEN) + New.Zero_Parallax = Parse_Float(); + END_CASE + CASE (BOKEH_TOKEN) Parse_Begin(); diff --git a/source/parser/reservedwords.cpp b/source/parser/reservedwords.cpp index 921ed2a28..7f624bc8e 100644 --- a/source/parser/reservedwords.cpp +++ b/source/parser/reservedwords.cpp @@ -639,7 +639,12 @@ const RESERVED_WORD Reserved_Words[LAST_TOKEN] = { {XYZ_TOKEN, "xyz"}, {YES_TOKEN, "yes"}, {Y_TOKEN, "y"}, - {Z_TOKEN, "z"} + {Z_TOKEN, "z"}, + + // 3D SBS rendering support: + {STEREOSCOPIC_TOKEN, "stereoscopic"}, + {ZEROPARALLAX_TOKEN, "zeroparallax"}, + {EYEOFFSET_TOKEN, "eyeoffset"}, }; } // end of pov namespace diff --git a/source/parser/reservedwords.h b/source/parser/reservedwords.h index 651fcce20..53b1c1cbb 100644 --- a/source/parser/reservedwords.h +++ b/source/parser/reservedwords.h @@ -640,6 +640,11 @@ enum TOKEN_IDS NUMBER_OF_TILES_TOKEN, PAVEMENT_TOKEN, TILING_TOKEN, + + STEREOSCOPIC_TOKEN, + ZEROPARALLAX_TOKEN, + EYEOFFSET_TOKEN, + XYZ_TOKEN, LAST_TOKEN }; diff --git a/source/povmain.cpp b/source/povmain.cpp index f62f8221e..991a652b6 100644 --- a/source/povmain.cpp +++ b/source/povmain.cpp @@ -118,7 +118,7 @@ int main(int argc, char **argv) // argv = nargv; // Init - povray_init(boost::bind(&BackendExitCallback), &backendAddress); + povray_init(std::bind(&BackendExitCallback), &backendAddress); if(err == kNoErr) err = POVMS_OpenContext(&frontendContext); @@ -129,7 +129,7 @@ int main(int argc, char **argv) POVMS_Object backendMessage; SimpleFrontend frontend(frontendContext, backendAddress, backendMessage, - boost::bind(CreateDefaultConsole), boost::bind(CreateDefaultDisplay, _1, _2, _3)); + std::bind(CreateDefaultConsole), std::bind(CreateDefaultDisplay, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); // Print help screens if(argc == 1) diff --git a/source/precomp.h b/source/precomp.h index e06c65921..0185e4068 100644 --- a/source/precomp.h +++ b/source/precomp.h @@ -61,6 +61,6 @@ #include #include #include -#include +#include #include diff --git a/vfe/vfe.cpp b/vfe/vfe.cpp index 5560960e2..810f70318 100644 --- a/vfe/vfe.cpp +++ b/vfe/vfe.cpp @@ -584,7 +584,7 @@ void vfeProcessRenderOptions::WriteError(const char *format, ...) // //////////////////////////////////////////////////////////////////////////////////////// -VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr& console) : +VirtualFrontEnd::VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, std::shared_ptr& console) : m_Session(&session), m_PlatformBase(session), renderFrontend (ctx) { backendAddress = addr ; @@ -600,7 +600,7 @@ VirtualFrontEnd::~VirtualFrontEnd() { // file-backed images may require a reference to PlatformBase to delete temporary files // we need to explicitly delete it here since otherwise PlatformBase will have been destroyed - // before the shared_ptr does its cleanup + // before the std::shared_ptr does its cleanup imageProcessing.reset(); if (backendAddress != POVMSInvalidAddress) renderFrontend.DisconnectFromBackend(backendAddress); @@ -691,7 +691,7 @@ bool VirtualFrontEnd::Start(POVMS_Object& opts) if (m_Session->OutputToFileSet()) { - imageProcessing = shared_ptr (new ImageProcessing (opts)); + imageProcessing = std::shared_ptr (new ImageProcessing (opts)); UCS2String filename = imageProcessing->GetOutputFilename (opts, 0, 0); options.SetUCS2String (kPOVAttrib_OutputFile, filename.c_str()); @@ -718,8 +718,8 @@ bool VirtualFrontEnd::Start(POVMS_Object& opts) opts.Set(kPOVAttrib_Declare, declares); imageProcessing.reset(); if (m_Session->OutputToFileSet()) - imageProcessing = shared_ptr (new ImageProcessing (opts)) ; - animationProcessing = shared_ptr (new AnimationProcessing (opts)) ; + imageProcessing = std::shared_ptr (new ImageProcessing (opts)) ; + animationProcessing = std::shared_ptr (new AnimationProcessing (opts)) ; options = animationProcessing->GetFrameRenderOptions () ; } @@ -1031,7 +1031,7 @@ State VirtualFrontEnd::Process() } // now set up the scene in preparation for parsing, then start the parser - try { sceneId = renderFrontend.CreateScene(backendAddress, options, boost::bind(&vfe::VirtualFrontEnd::CreateConsole, this)); } + try { sceneId = renderFrontend.CreateScene(backendAddress, options, std::bind(&vfe::VirtualFrontEnd::CreateConsole, this)); } catch(pov_base::Exception& e) { m_Session->SetFailed(); @@ -1078,7 +1078,7 @@ State VirtualFrontEnd::Process() // case. return state; } - try { viewId = renderFrontend.CreateView(sceneId, options, imageProcessing, boost::bind(&vfe::VirtualFrontEnd::CreateDisplay, this, _1, _2, _3)); } + try { viewId = renderFrontend.CreateView(sceneId, options, imageProcessing, std::bind(&vfe::VirtualFrontEnd::CreateDisplay, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); } catch(pov_base::Exception& e) { m_Session->SetFailed(); @@ -1127,7 +1127,7 @@ State VirtualFrontEnd::Process() } // now we display the render window, if enabled - shared_ptr display(GetDisplay()); + std::shared_ptr display(GetDisplay()); if (display != NULL) { vfeDisplay *disp = dynamic_cast(display.get()); diff --git a/vfe/vfe.h b/vfe/vfe.h index 98fa565de..456e193ee 100644 --- a/vfe/vfe.h +++ b/vfe/vfe.h @@ -217,7 +217,7 @@ namespace vfe class VirtualFrontEnd { public: - VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, shared_ptr& console) ; + VirtualFrontEnd(vfeSession& session, POVMSContext ctx, POVMSAddress addr, POVMS_Object& msg, POVMS_Object *result, std::shared_ptr& console) ; virtual ~VirtualFrontEnd() ; virtual bool Start(POVMS_Object& opts) ; @@ -230,7 +230,7 @@ namespace vfe virtual bool IsPausable() ; virtual bool Paused() ; virtual bool PausePending() { return m_PauseRequested; } - virtual shared_ptr GetDisplay() { return renderFrontend.GetDisplay(viewId); } + virtual std::shared_ptr GetDisplay() { return renderFrontend.GetDisplay(viewId); } // TODO: take care of any pending messages (e.g. a thread waiting on a blocking send) virtual void InvalidateBackend() { backendAddress = POVMSInvalidAddress; } @@ -248,9 +248,9 @@ namespace vfe POVMS_Object options; RenderFrontendBase::SceneId sceneId; RenderFrontendBase::ViewId viewId; - shared_ptr animationProcessing ; - shared_ptr imageProcessing ; - shared_ptr shelloutProcessing; + std::shared_ptr animationProcessing ; + std::shared_ptr imageProcessing ; + std::shared_ptr shelloutProcessing; Console **consoleResult; Display **displayResult; vfeSession* m_Session; diff --git a/vfe/vfesession.cpp b/vfe/vfesession.cpp index 6dc2ec296..90e5f9910 100644 --- a/vfe/vfesession.cpp +++ b/vfe/vfesession.cpp @@ -78,7 +78,7 @@ vfeSession::vfeSession(int id) m_RequestFlag = rqNoRequest; m_RequestResult = 0; m_StartTime = 0; - m_DisplayCreator = boost::bind(&vfe::vfeSession::DefaultDisplayCreator, this, _1, _2, _3, _4, _5); + m_DisplayCreator = std::bind(&vfe::vfeSession::DefaultDisplayCreator, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5); Reset(); } @@ -542,10 +542,10 @@ const char *vfeSession::GetBackendStateName (void) const // Returns a copy of the shared pointer containing the current instance // of a pov_frontend::Display-derived render preview instance, which may // be NULL. -shared_ptr vfeSession::GetDisplay() const +std::shared_ptr vfeSession::GetDisplay() const { if (m_Frontend == NULL) - return (shared_ptr()); + return (std::shared_ptr()); return m_Frontend->GetDisplay(); } @@ -580,10 +580,10 @@ void vfeSession::WorkerThread() return; } - m_BackendThread = povray_init (boost::bind(&vfeSession::BackendThreadNotify, this), const_cast(&pov::RenderThreadAddr)) ; + m_BackendThread = povray_init (std::bind(&vfeSession::BackendThreadNotify, this), const_cast(&pov::RenderThreadAddr)) ; POVMS_Output_Context = pov::POVMS_GUI_Context ; - m_Console = shared_ptr (new vfeConsole(this, m_ConsoleWidth)) ; + m_Console = std::shared_ptr (new vfeConsole(this, m_ConsoleWidth)) ; POVMS_Object obj ; m_Frontend = new VirtualFrontEnd (*this, POVMS_Output_Context, (POVMSAddress) pov::RenderThreadAddr, obj, NULL, m_Console) ; diff --git a/vfe/vfesession.h b/vfe/vfesession.h index cac1ec947..309e6c698 100644 --- a/vfe/vfesession.h +++ b/vfe/vfesession.h @@ -519,7 +519,7 @@ namespace vfe // Returns a copy of the shared pointer containing the current instance // of a pov_frontend::Display-derived render preview instance, which may // be NULL. - virtual shared_ptr GetDisplay() const; + virtual std::shared_ptr GetDisplay() const; // If a VFE implementation has provided a display creator functor via // vfeSession::SetDisplayCreator(), this method will call it with the @@ -1239,7 +1239,7 @@ namespace vfe static bool m_Initialized; static vfeSession *m_CurrentSessionTemporaryHack; - shared_ptr m_Console; + std::shared_ptr m_Console; virtual vfeDisplay *DefaultDisplayCreator (unsigned int width, unsigned int height, GammaCurvePtr gamma, vfeSession *session, bool visible); DisplayCreator m_DisplayCreator; diff --git a/vfe/win/vfeplatform.cpp b/vfe/win/vfeplatform.cpp index 49c44ea48..d8c32ed66 100644 --- a/vfe/win/vfeplatform.cpp +++ b/vfe/win/vfeplatform.cpp @@ -511,7 +511,7 @@ namespace vfePlatform startupInfo.dwFlags = pov_frontend::MinimizeShellouts() ? STARTF_USESHOWWINDOW : 0; startupInfo.wShowWindow = SW_SHOWMINNOACTIVE; - shared_ptr buf(new char[params.size() + 1]); + std::shared_ptr buf(new char[params.size() + 1]); strcpy(buf.get(), params.c_str()); if ((m_ProcessRunning = CreateProcess(cmd.c_str(), buf.get(), NULL, NULL, false, 0, NULL, NULL, &startupInfo, &procInfo))) { diff --git a/windows/povconfig/syspovconfig.h b/windows/povconfig/syspovconfig.h index 6ef599654..ca0c75a42 100644 --- a/windows/povconfig/syspovconfig.h +++ b/windows/povconfig/syspovconfig.h @@ -65,7 +65,7 @@ #include #include -#include +#include #include #include @@ -90,8 +90,8 @@ using std::list; using std::runtime_error; // these may actually be the boost implementations, depending on what boost/tr1/memory.hpp has pulled in -using std::tr1::shared_ptr; -using std::tr1::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; #endif // STD_POV_TYPES_DECLARED diff --git a/windows/povconfig/syspovconfig_msvc.h b/windows/povconfig/syspovconfig_msvc.h index 60e3079f5..d71cce60f 100644 --- a/windows/povconfig/syspovconfig_msvc.h +++ b/windows/povconfig/syspovconfig_msvc.h @@ -113,8 +113,17 @@ #elif _MSC_VER >= 1600 && _MSC_VER < 1700 #define COMPILER_VER ".msvc10" #define METADATA_COMPILER_STRING "msvc 10" + #elif _MSC_VER >= 1700 && _MSC_VER < 1800 + #define COMPILER_VER ".msvc11" + #define METADATA_COMPILER_STRING "msvc 11" + #elif _MSC_VER >= 1800 && _MSC_VER < 1900 + #define COMPILER_VER ".msvc12" + #define METADATA_COMPILER_STRING "msvc 12" + #elif _MSC_VER >= 1900 && _MSC_VER < 2000 + #define COMPILER_VER ".msvc13" + #define METADATA_COMPILER_STRING "msvc 13" #else - #error Please update msvc.h to include this version of MSVC + #error Please update msvc.h to include this version of MSVC #endif #define COMPILER_NAME "Microsoft Visual C++" #define COMPILER_VERSION _MSC_VER diff --git a/windows/pvdisplay.cpp b/windows/pvdisplay.cpp index a9080d481..d96ac0da6 100644 --- a/windows/pvdisplay.cpp +++ b/windows/pvdisplay.cpp @@ -101,7 +101,7 @@ namespace pov_frontend using namespace povwin; -shared_ptr gDisplay; +std::shared_ptr gDisplay; BitmapInfo WinLegacyDisplay::m_BitmapTemplate; @@ -161,6 +161,14 @@ bool WinLegacyDisplay::TakeOver(WinDisplay *display) return (true) ; } +// Enumerates monitors. If we have more, we assume the second monitor is a 'second screen' that we want to render on. +static BOOL CALLBACK MonitorEnum(HMONITOR hMon, HDC hdc, LPRECT lprcMonitor, LPARAM pData) +{ + WinLegacyDisplay* pThis = reinterpret_cast(pData); + pThis->monitors.push_back(*lprcMonitor); + return TRUE; +} + bool WinLegacyDisplay::CreateRenderWindow (void) { int width ; @@ -178,25 +186,50 @@ bool WinLegacyDisplay::CreateRenderWindow (void) rect.top = 0 ; rect.right = GetWidth() ; rect.bottom = GetHeight() ; - flags = WS_OVERLAPPEDWINDOW ; - AdjustWindowRectEx (&rect, flags, false, 0) ; - - // left and top will probably be negative - width = m_MaxWidth = rect.right - rect.left ; - height = m_MaxHeight = rect.bottom - rect.top ; - - if (width > screen_width - 64) - width = screen_width - 64 ; - if (height > screen_height - 48) - height = screen_height - 48 ; - if (renderwin_left < screen_origin_x) - renderwin_left = screen_origin_x ; - if (renderwin_top < screen_origin_y) - renderwin_top = screen_origin_y ; - if (renderwin_left + width > virtual_screen_width + screen_origin_x) - renderwin_left = virtual_screen_width - width + screen_origin_x ; - if (renderwin_top + height > virtual_screen_height + screen_origin_y) - renderwin_top = virtual_screen_height - height + screen_origin_y ; + + // Check monitors: + monitors.clear(); + EnumDisplayMonitors(0, 0, MonitorEnum, (LPARAM)this); + + if (monitors.size() > 1) + { + flags = WS_POPUP | WS_VISIBLE | WS_SYSMENU; + + rect.top = monitors[1].top; + rect.left = monitors[1].left; + rect.bottom = monitors[1].bottom; + rect.right = monitors[1].right; + + width = m_MaxWidth = rect.right - rect.left; + height = m_MaxHeight = rect.bottom - rect.top; + + renderwin_top = rect.top; + renderwin_left = rect.left; + } + else + { + flags = WS_OVERLAPPEDWINDOW; + AdjustWindowRectEx(&rect, flags, false, 0); + + // left and top will probably be negative + width = m_MaxWidth = rect.right - rect.left; + height = m_MaxHeight = rect.bottom - rect.top; + + if (width > screen_width - 64) + width = screen_width - 64; + if (height > screen_height - 48) + height = screen_height - 48; + if (renderwin_left < screen_origin_x) + renderwin_left = screen_origin_x; + if (renderwin_top < screen_origin_y) + renderwin_top = screen_origin_y; + if (renderwin_left + width > virtual_screen_width + screen_origin_x) + renderwin_left = virtual_screen_width - width + screen_origin_x; + if (renderwin_top + height > virtual_screen_height + screen_origin_y) + renderwin_top = virtual_screen_height - height + screen_origin_y; + } + // --- + if (m_BitmapSurface != NULL) { @@ -275,7 +308,7 @@ bool WinLegacyDisplay::CreateRenderWindow (void) SetWindowPos (m_Handle, main_window, 0, 0, 0, 0, flags) ; } else - renderwin_flags = WS_MINIMIZE ; + renderwin_flags = WS_OVERLAPPEDWINDOW | WS_MINIMIZE; } SetClassLongPtr (m_Handle, GCLP_HCURSOR, (LONG_PTR) LoadCursor (NULL, m_Rendering ? IDC_ARROW : IDC_CROSS)) ; @@ -602,7 +635,7 @@ void WinLegacyDisplay::Clear() { for (int x = 0 ; x < m_Bitmap.header.biWidth ; x++) { - int colour = (x & 8) == (y & 8) ? 0xff : 0xc0 ; + int colour = 0xc0; // HACK. If you want a headache, try this in 3D SBS mode. Annoying blocks wth stereo: (x & 8) == (y & 8) ? 0xff : 0xc0; unsigned char *p = m_BitmapSurface + (m_Bitmap.header.biHeight - 1 - y) * m_BytesPerLine + x ; unsigned char dither = dither8x8 [((x & 7) << 3) | (y & 7)] ; *p = 20 + div51 [colour] + (mod51 [colour] > dither) + @@ -620,11 +653,14 @@ void WinLegacyDisplay::Clear() { if (x + 8 <= m_Bitmap.header.biWidth) { - memset (p, (x & 8) == (y & 8) ? 0xff : 0xc0, 24) ; + // HACK. If you want a headache, try this in 3D SBS mode. Annoying blocks wth stereo: (x & 8) == (y & 8) ? 0xff : 0xc0; + //memset (p, (x & 8) == (y & 8) ? 0xff : 0xc0, 24) ; + memset(p, 0xc0, 24); p += 24 ; } else - memset (p, (x & 8) == (y & 8) ? 0xff : 0xc0, (m_Bitmap.header.biWidth - x) * 3) ; + // HACK: memset (p, (x & 8) == (y & 8) ? 0xff : 0xc0, (m_Bitmap.header.biWidth - x) * 3) ; + memset(p, 0xc0, (m_Bitmap.header.biWidth - x) * 3); } } } @@ -949,7 +985,7 @@ LRESULT WinLegacyDisplay::WindowProc (UINT message, WPARAM wParam, LPARAM lParam switch (wParam) { case SIZE_MINIMIZED : - renderwin_flags = WS_MINIMIZE ; + renderwin_flags = WS_OVERLAPPEDWINDOW | WS_MINIMIZE; return (0) ; case SIZE_MAXIMIZED : diff --git a/windows/pvdisplay.h b/windows/pvdisplay.h index d7e6c96d4..49e5cd921 100644 --- a/windows/pvdisplay.h +++ b/windows/pvdisplay.h @@ -42,7 +42,7 @@ namespace pov_frontend using namespace vfe; using namespace povwin; - extern shared_ptr gDisplay; + extern std::shared_ptr gDisplay; class WinDisplay : public vfeDisplay { @@ -60,6 +60,8 @@ namespace pov_frontend virtual void SetCaption(LPCTSTR Caption) { if (m_Handle != NULL) SetWindowText (m_Handle, Caption); } virtual void SetRenderState(bool IsRendering) = 0 ; + std::vector monitors; // Added by STEFAN DE BRUIJN + protected: virtual LRESULT WindowProc (UINT message, WPARAM wParam, LPARAM lParam) = 0; HWND m_Handle; diff --git a/windows/pvengine.cpp b/windows/pvengine.cpp index 72ce174b1..e9587025c 100644 --- a/windows/pvengine.cpp +++ b/windows/pvengine.cpp @@ -125,7 +125,7 @@ char *WriteDump(struct _EXCEPTION_POINTERS *pExceptionInfo, bool full, long time namespace pov_frontend { - extern shared_ptr gDisplay; + extern std::shared_ptr gDisplay; } namespace vfePlatform diff --git a/windows/vs13/StepOver.reg b/windows/vs13/StepOver.reg new file mode 100644 index 0000000000000000000000000000000000000000..0a07fcd0c0186d700b7dea30b48089c28aec1415 GIT binary patch literal 466 zcmb7=&r8EV5QV?9;Qvr^^dPqWI0!vRRV-SCDh4r9N>eo;-I7Gbe_s7|$)yJm5;nW@ z-psr=^Yfikv7#jKNkfk*OJ2kpT57&T&SWd2VBF(gzLu?wSH_3zvgfzWRyvPdaB0m0 zGp@K{#EJKeiT6lu%(ZO6t=u_x + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + + + + + + {35A2DC31-84BC-4F7A-9C93-1D072432AD79} + boost_date_time + + + + StaticLibrary + true + Unicode + v120 + + + StaticLibrary + true + Unicode + v120 + + + StaticLibrary + false + true + Unicode + v120 + + + StaticLibrary + false + true + Unicode + v120 + + + StaticLibrary + false + true + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_date_time32d + + + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_date_time64d + + + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_date_time32 + + + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_date_time64 + + + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_date_time32-sse2 + + + + + + Level3 + Disabled + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;BOOST_DATE_TIME_STATIC_LINK;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + ProgramDatabase + Default + MultiThreadedDebug + false + true + true + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;BOOST_DATE_TIME_STATIC_LINK;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + ProgramDatabase + Default + MultiThreadedDebug + false + true + true + false + true + + + Windows + true + + + + + Level3 + + + Full + false + true + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOOST_DATE_TIME_STATIC_LINK;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + AnySuitable + Speed + MultiThreaded + false + true + true + + + Windows + true + true + true + + + + + Level3 + + + Full + false + true + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOOST_DATE_TIME_STATIC_LINK;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + AnySuitable + Speed + MultiThreaded + false + true + true + + + Windows + true + true + true + + + + + Level3 + + + Full + false + true + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOOST_DATE_TIME_STATIC_LINK;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + AnySuitable + Speed + MultiThreaded + false + true + StreamingSIMDExtensions2 + true + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/windows/vs13/boost_date_time.vcxproj.filters b/windows/vs13/boost_date_time.vcxproj.filters new file mode 100644 index 000000000..78a75a5f5 --- /dev/null +++ b/windows/vs13/boost_date_time.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + + + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/boost_thread.vcxproj b/windows/vs13/boost_thread.vcxproj new file mode 100644 index 000000000..79a6e749c --- /dev/null +++ b/windows/vs13/boost_thread.vcxproj @@ -0,0 +1,235 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + + + + + + {10B193D4-E27B-4438-A825-BFB3D2B4C74D} + boost_thread + + + + StaticLibrary + true + Unicode + v120 + + + StaticLibrary + true + Unicode + v120 + + + StaticLibrary + false + true + Unicode + v120 + + + StaticLibrary + false + true + Unicode + v120 + + + StaticLibrary + false + true + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_thread32d + + + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_thread64d + + + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_thread32 + + + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_thread64 + + + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + libboost_thread32-sse2 + + + + + + Level3 + Disabled + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;BOOST_THREAD_BUILD_LIB=1;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + ProgramDatabase + Default + MultiThreadedDebug + false + true + true + 4005 + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;BOOST_THREAD_BUILD_LIB=1;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + ProgramDatabase + Default + MultiThreadedDebug + false + true + true + false + true + 4005 + + + Windows + true + + + + + Level3 + + + Full + false + true + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOOST_THREAD_BUILD_LIB=1;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + AnySuitable + Speed + MultiThreaded + false + true + true + 4005 + + + Windows + true + true + true + + + + + Level3 + + + Full + false + true + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOOST_THREAD_BUILD_LIB=1;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + AnySuitable + Speed + MultiThreaded + false + true + true + 4005 + + + Windows + true + true + true + + + + + Level3 + + + Full + false + true + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;BOOST_THREAD_BUILD_LIB=1;BOOST_ALL_NO_LIB;%(PreprocessorDefinitions) + ..\..\libraries\boost;%(AdditionalIncludeDirectories) + AnySuitable + Speed + MultiThreaded + false + true + StreamingSIMDExtensions2 + true + 4005 + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/windows/vs13/boost_thread.vcxproj.filters b/windows/vs13/boost_thread.vcxproj.filters new file mode 100644 index 000000000..da3437145 --- /dev/null +++ b/windows/vs13/boost_thread.vcxproj.filters @@ -0,0 +1,24 @@ + + + + + {cb1a2c20-bc9c-42c3-a1d2-0c0d88873162} + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + + + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/cmedit.vcxproj b/windows/vs13/cmedit.vcxproj new file mode 100644 index 000000000..a18568e47 --- /dev/null +++ b/windows/vs13/cmedit.vcxproj @@ -0,0 +1,382 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {37FDEA25-43CD-4AF0-A232-281E11851E75} + + + + DynamicLibrary + false + MultiByte + true + v120 + + + DynamicLibrary + false + MultiByte + true + v120 + + + DynamicLibrary + false + MultiByte + v120 + + + DynamicLibrary + false + MultiByte + true + v120 + + + DynamicLibrary + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + cmedit32d + cmedit32 + cmedit32-sse2 + cmedit64d + cmedit64 + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + true + WIN32;_WINDOWS;_DEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions) + true + true + Sync + EnableFastChecks + MultiThreadedDebug + false + + + true + $(IntDir) + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + comctl32.lib;winmm.lib;../cmedit/implib/povcmax32.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + true + $(OutDir)$(TargetName).pdb + Windows + true + false + + + $(OutDir)lib/cmedit32d.lib + MachineX86 + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + false + X64 + + + Disabled + true + WIN32;_WINDOWS;_DEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions) + true + true + Sync + EnableFastChecks + MultiThreadedDebug + + + true + $(IntDir) + Level3 + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + + + comctl32.lib;winmm.lib;../cmedit/implib/povcmax64.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + true + $(OutDir)$(TargetName).pdb + Windows + true + false + + + $(OutDir)lib/cmedit64d.lib + MachineX64 + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + false + + + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_WINNT=0x0500;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + false + NotSet + + + true + $(IntDir) + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + comctl32.lib;winmm.lib;../cmedit/implib/povcmax32.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + true + $(OutDir)$(TargetName).pdb + Windows + true + true + false + + + $(OutDir)lib/cmedit32.lib + MachineX86 + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + false + X64 + + + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_WINNT=0x0500;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + + + true + $(IntDir) + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + comctl32.lib;winmm.lib;../cmedit/implib/povcmax64.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + true + $(OutDir)$(TargetName).pdb + Windows + true + true + false + + + $(OutDir)lib/cmedit64.lib + MachineX64 + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + false + + + true + WIN32;_WINDOWS;NDEBUG;_USRDLL;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_WINNT=0x0500;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + + + true + $(IntDir) + Level3 + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + + + comctl32.lib;winmm.lib;../cmedit/implib/povcmax32-sse2.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) + + + true + $(OutDir)$(TargetName).pdb + Windows + true + true + false + + + $(OutDir)lib/cmedit32-sse2.lib + MachineX86 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/cmedit.vcxproj.filters b/windows/vs13/cmedit.vcxproj.filters new file mode 100644 index 000000000..a6a6d7b55 --- /dev/null +++ b/windows/vs13/cmedit.vcxproj.filters @@ -0,0 +1,88 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files + + + \ No newline at end of file diff --git a/windows/vs13/console.vcxproj b/windows/vs13/console.vcxproj new file mode 100644 index 000000000..815cd7804 --- /dev/null +++ b/windows/vs13/console.vcxproj @@ -0,0 +1,351 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {3B6BB403-FC72-45FF-A431-9295A1AEB7A3} + console + Win32Proj + + + + Application + true + v120 + + + Application + true + v120 + + + Application + v120 + + + Application + true + v120 + + + Application + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + povconsole32d + povconsole32 + povconsole32-sse2 + povconsole64d + povconsole64 + + + + Disabled + ..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + false + Sync + Default + MultiThreadedDebug + false + true + true + true + $(IntDir) + Level3 + EditAndContinue + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + + + true + $(OutDir)$(TargetName).pdb + Console + 8388608 + true + false + + + MachineX86 + + + + + + + + + X64 + + + Disabled + ..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions) + true + false + Sync + Default + MultiThreadedDebug + false + true + true + true + $(IntDir) + Level3 + ProgramDatabase + winprecomp.h;%(ForcedIncludeFiles) + 4800;%(DisableSpecificWarnings) + + + true + $(OutDir)$(TargetName).pdb + Console + 67108864 + true + false + + + MachineX64 + + + + + + + + + ..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + NotSet + true + $(IntDir) + Level3 + ProgramDatabase + false + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + + + true + Console + 8388608 + true + true + true + false + + + MachineX86 + + + + + + + + + X64 + + + ..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0500;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + true + $(IntDir) + Level3 + ProgramDatabase + false + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + + + true + Console + 67108864 + true + true + true + false + + + MachineX64 + + + + + + + + + ..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreaded + false + StreamingSIMDExtensions2 + true + $(IntDir) + Level3 + ProgramDatabase + false + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + + + true + Console + 8388608 + true + true + true + false + + + MachineX86 + + + + + + + + + + + + {c46b9a53-86d8-4b7f-ab15-b2c04518a195} + + + {76addb29-9c6a-442c-9ba9-764c050f75dd} + + + {7df42126-d237-41d3-9abe-a3acc8bac56e} + + + {35a2dc31-84bc-4f7a-9c93-1d072432ad79} + + + {10b193d4-e27b-4438-a825-bfb3d2b4c74d} + + + {9edb5c0f-bfd0-4a59-bb93-f06a52bb0128} + + + {3780ccde-4967-4c31-b6a3-3c2570bdd3e4} + false + + + {e1ea88af-6b44-4225-b97b-b485fc9db23e} + false + + + {c6d9b754-11eb-4fc3-8683-593b53e9ad1f} + false + + + {c6d9b754-11eb-4fc3-8683-593b2377d043} + false + + + {c6d9b754-11eb-4fc3-8683-593bfd58c904} + false + + + {186baef6-cf24-42c1-8ce3-25590cb9f6e7} + false + + + {72793df1-d4af-4aa0-a606-7b51ed2a3f5c} + false + + + {8bb067c4-7135-4643-863c-49c520beea01} + false + + + + + + \ No newline at end of file diff --git a/windows/vs13/console.vcxproj.filters b/windows/vs13/console.vcxproj.filters new file mode 100644 index 000000000..6e3524eed --- /dev/null +++ b/windows/vs13/console.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/jpeg.vcxproj b/windows/vs13/jpeg.vcxproj new file mode 100644 index 000000000..ffaca3c6c --- /dev/null +++ b/windows/vs13/jpeg.vcxproj @@ -0,0 +1,354 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4} + jpeg + + + + StaticLibrary + false + MultiByte + true + v120 + + + StaticLibrary + false + MultiByte + v120 + + + StaticLibrary + false + MultiByte + true + v120 + + + StaticLibrary + false + MultiByte + v120 + + + StaticLibrary + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + jpeg32d + jpeg32 + jpeg32-sse2 + jpeg64d + jpeg64 + + + + MaxSpeed + OnlyExplicitInline + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + NotSet + + + + + true + $(IntDir) + Level2 + true + ProgramDatabase + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + + + + + true + $(IntDir) + Level2 + true + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + Disabled + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + + + + + true + $(IntDir) + Level2 + true + ProgramDatabase + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + X64 + + + Disabled + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + + + + + true + $(IntDir) + Level2 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + MaxSpeed + OnlyExplicitInline + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + StreamingSIMDExtensions2 + + + + + true + $(IntDir) + Level2 + true + ProgramDatabase + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/jpeg.vcxproj.filters b/windows/vs13/jpeg.vcxproj.filters new file mode 100644 index 000000000..75dc9b67a --- /dev/null +++ b/windows/vs13/jpeg.vcxproj.filters @@ -0,0 +1,178 @@ + + + + + {9c2f51c5-2d77-41cd-a1f1-e0379cb83921} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/libpng.vcxproj b/windows/vs13/libpng.vcxproj new file mode 100644 index 000000000..48eaf4cc4 --- /dev/null +++ b/windows/vs13/libpng.vcxproj @@ -0,0 +1,329 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E} + libpng + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + libpng32d + libpng32 + libpng32-sse2 + libpng64d + libpng64 + + + + MaxSpeed + OnlyExplicitInline + .\;..\..\libraries\zlib;..\..\..\source;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + NotSet + + + + + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + + + 0x0409 + + + true + + + + + + + copy ..\..\libraries\png\scripts\pnglibconf.h.prebuilt ..\..\libraries\png\pnglibconf.h + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + .\;..\..\libraries\zlib;..\..\..\source;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + + + + + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + 0x0409 + + + true + + + + + + + copy ..\..\libraries\png\scripts\pnglibconf.h.prebuilt ..\..\libraries\png\pnglibconf.h + + + + + Disabled + .\;..\..\libraries\zlib;..\..\..\source;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + + + + + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + + + 0x0409 + + + true + + + + + + + copy ..\..\libraries\png\scripts\pnglibconf.h.prebuilt ..\..\libraries\png\pnglibconf.h + + + + + X64 + + + Disabled + .\;..\..\libraries\zlib;..\..\..\source;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + Sync + Default + MultiThreadedDebug + false + + + + + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + 0x0409 + + + true + + + + + + + copy ..\..\libraries\png\scripts\pnglibconf.h.prebuilt ..\..\libraries\png\pnglibconf.h + + + + + MaxSpeed + OnlyExplicitInline + .\;..\..\libraries\zlib;..\..\..\source;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + StreamingSIMDExtensions2 + + + + + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + + + 0x0409 + + + true + + + + + + + copy ..\..\libraries\png\scripts\pnglibconf.h.prebuilt ..\..\libraries\png\pnglibconf.h + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/openexr_Half.vcxproj b/windows/vs13/openexr_Half.vcxproj new file mode 100644 index 000000000..0587ee3a4 --- /dev/null +++ b/windows/vs13/openexr_Half.vcxproj @@ -0,0 +1,234 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128} + Half + + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + true + MultiByte + v120 + + + StaticLibrary + true + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin32\lib\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + false + Half32d + Half64d + bin32\lib\ + bin64\lib\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + false + false + Half32 + Half64 + Half32-sse2 + + + + Disabled + ..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;HALF_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + + + Level3 + ProgramDatabase + true + + + Windows + true + + + + + Disabled + ..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;HALF_EXPORTS;%(PreprocessorDefinitions) + Default + MultiThreadedDebug + true + true + + + Level3 + ProgramDatabase + false + false + true + + + Windows + true + + + + + ..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;HALF_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level3 + ProgramDatabase + Full + AnySuitable + true + Speed + true + + + Windows + true + true + false + + + + + ..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;HALF_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level3 + ProgramDatabase + Full + AnySuitable + true + Speed + true + + + Windows + true + true + false + + + + + ..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;HALF_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level3 + ProgramDatabase + Full + AnySuitable + true + Speed + true + StreamingSIMDExtensions2 + + + Windows + true + true + false + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/openexr_Half.vcxproj.filters b/windows/vs13/openexr_Half.vcxproj.filters new file mode 100644 index 000000000..f1a5e2e69 --- /dev/null +++ b/windows/vs13/openexr_Half.vcxproj.filters @@ -0,0 +1,29 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/openexr_Iex.vcxproj b/windows/vs13/openexr_Iex.vcxproj new file mode 100644 index 000000000..da7e9df0d --- /dev/null +++ b/windows/vs13/openexr_Iex.vcxproj @@ -0,0 +1,238 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {C46B9A53-86D8-4B7F-AB15-B2C04518A195} + Iex + + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + true + MultiByte + v120 + + + StaticLibrary + true + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin32\lib\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + false + Iex32d + Iex64d + bin32\lib\ + bin64\lib\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + false + false + Iex32 + Iex64 + Iex32-sse2 + + + + Disabled + ..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;IEX_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + + + Level2 + ProgramDatabase + true + + + Windows + true + + + + + Disabled + ..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;IEX_EXPORTS;%(PreprocessorDefinitions) + Default + MultiThreadedDebug + true + true + + + Level2 + ProgramDatabase + false + false + true + + + Windows + true + + + + + ..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;IEX_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + + + Windows + true + true + false + + + + + ..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;IEX_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + + + Windows + true + true + false + + + + + ..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;IEX_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + StreamingSIMDExtensions2 + + + Windows + true + true + false + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/openexr_Iex.vcxproj.filters b/windows/vs13/openexr_Iex.vcxproj.filters new file mode 100644 index 000000000..c21ead370 --- /dev/null +++ b/windows/vs13/openexr_Iex.vcxproj.filters @@ -0,0 +1,39 @@ + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + {c6767774-e8c0-44ea-ac64-70d50eedaf6f} + + + {81f98c01-affc-471d-ada1-c04051236895} + + + \ No newline at end of file diff --git a/windows/vs13/openexr_IlmImf.vcxproj b/windows/vs13/openexr_IlmImf.vcxproj new file mode 100644 index 000000000..dcac258c4 --- /dev/null +++ b/windows/vs13/openexr_IlmImf.vcxproj @@ -0,0 +1,359 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E} + IlmImf + + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + true + MultiByte + v120 + + + StaticLibrary + true + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin32\lib\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + false + IlmImf32d + IlmImf64d + bin32\lib\ + bin64\lib\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + false + false + IlmImf32 + IlmImf64 + IlmImf32-sse2 + + + + Disabled + ..\..\libraries\openexr\IlmImf;..\..\libraries\openexr\config.windows;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\config.windows;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;ILMIMF_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + + + Level2 + ProgramDatabase + true + 4244;4305 + + + Windows + true + + + + + Disabled + ..\..\libraries\openexr\IlmImf;..\..\libraries\openexr\config.windows;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\config.windows;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;ILMIMF_EXPORTS;%(PreprocessorDefinitions) + Default + MultiThreadedDebug + true + true + + + Level2 + ProgramDatabase + false + false + true + 4244;4305 + + + Windows + true + + + + + ..\..\libraries\openexr\IlmImf;..\..\libraries\openexr\config.windows;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\config.windows;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;ILMIMF_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + 4244;4305 + + + Windows + true + true + false + + + + + ..\..\libraries\openexr\IlmImf;..\..\libraries\openexr\config.windows;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\config.windows;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;ILMIMF_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + 4244;4305 + + + Windows + true + true + false + + + + + ..\..\libraries\openexr\IlmImf;..\..\libraries\openexr\config.windows;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\config.windows;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;ILMIMF_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + StreamingSIMDExtensions2 + 4244;4305 + + + Windows + true + true + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/openexr_IlmImf.vcxproj.filters b/windows/vs13/openexr_IlmImf.vcxproj.filters new file mode 100644 index 000000000..355a8d5d8 --- /dev/null +++ b/windows/vs13/openexr_IlmImf.vcxproj.filters @@ -0,0 +1,387 @@ + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + {ad6e2187-d9e6-408c-b35b-66a838365e3d} + + + {21a30d80-08d1-4931-907b-ad253707bf98} + + + \ No newline at end of file diff --git a/windows/vs13/openexr_IlmThread.vcxproj b/windows/vs13/openexr_IlmThread.vcxproj new file mode 100644 index 000000000..5efc6386f --- /dev/null +++ b/windows/vs13/openexr_IlmThread.vcxproj @@ -0,0 +1,245 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {76ADDB29-9C6A-442C-9BA9-764C050F75DD} + IlmThread + + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + true + MultiByte + v120 + + + StaticLibrary + true + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + bin32\lib\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + false + IlmThread32d + IlmThread64d + bin32\lib\ + bin64\lib\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + false + false + false + IlmThread32 + IlmThread64 + IlmThread32-sse2 + + + + Disabled + ..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;ILMTHREAD_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + + + Level2 + ProgramDatabase + true + + + Windows + true + + + + + Disabled + ..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;ILMTHREAD_EXPORTS;%(PreprocessorDefinitions) + Default + MultiThreadedDebug + true + true + + + Level2 + ProgramDatabase + false + false + true + + + Windows + true + + + + + ..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;ILMTHREAD_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + + + Windows + true + true + false + + + + + ..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;ILMTHREAD_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + + + Windows + true + true + false + + + + + ..\..\libraries\ilmbase\IlmThread;..\..\libraries\ilmbase\Iex;..\..\libraries\ilmbase\config.windows;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_HAS_CPP0X=0;ILMTHREAD_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + true + + + Level2 + ProgramDatabase + Full + AnySuitable + true + Speed + true + StreamingSIMDExtensions2 + + + Windows + true + true + false + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/openexr_IlmThread.vcxproj.filters b/windows/vs13/openexr_IlmThread.vcxproj.filters new file mode 100644 index 000000000..a574c4501 --- /dev/null +++ b/windows/vs13/openexr_IlmThread.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + {aa6afb66-8182-468e-9d30-dc020427f0b7} + + + {218473d0-07b5-4a0c-85f2-776237e88da7} + + + \ No newline at end of file diff --git a/windows/vs13/openexr_b44ExpLogTable.vcxproj b/windows/vs13/openexr_b44ExpLogTable.vcxproj new file mode 100644 index 000000000..33b3f09d3 --- /dev/null +++ b/windows/vs13/openexr_b44ExpLogTable.vcxproj @@ -0,0 +1,191 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7} + Win32Proj + b44ExpLogTable + b44ExpLogTable + + + + Application + false + Unicode + v120 + + + Application + false + Unicode + v120 + + + Application + true + Unicode + v120 + + + Application + true + Unicode + v120 + + + + + + + + + + + + + + + + + + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + b44ExpLogTable + .exe + Manifest + + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + b44ExpLogTable + .exe + Manifest + + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + b44ExpLogTable + .exe + BscMake + + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + b44ExpLogTable + .exe + BscMake + + + + Disabled + ..\..\libraries\ilmbase\Half + WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Level3 + + + Console + true + + + "$(TargetPath)" > ..\..\libraries\openexr\IlmImf\b44ExpLogTable.h + + + ..\..\libraries\openexr\IlmImf\b44ExpLogTable.h + Generating b44ExpLogTable.h... + + + + + Disabled + ..\..\libraries\ilmbase\Half + WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + MultiThreadedDebug + + + Level3 + + + Console + true + + + "$(TargetPath)" > ..\..\libraries\openexr\IlmImf\b44ExpLogTable.h + + + ..\..\libraries\openexr\IlmImf\b44ExpLogTable.h + Generating b44ExpLogTable.h... + + + + + ..\..\libraries\ilmbase\Half + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + + + Console + UseLinkTimeCodeGeneration + + + "$(TargetPath)" > ..\..\libraries\openexr\IlmImf\b44ExpLogTable.h + + + ..\..\libraries\openexr\IlmImf\b44ExpLogTable.h + Generating b44ExpLogTable.h... + + + + + ..\..\libraries\ilmbase\Half + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + + + Console + UseLinkTimeCodeGeneration + + + "$(TargetPath)" > ..\..\libraries\openexr\IlmImf\b44ExpLogTable.h + + + ..\..\libraries\openexr\IlmImf\b44ExpLogTable.h + Generating b44ExpLogTable.h... + + + + + + + + {9edb5c0f-bfd0-4a59-bb93-f06a52bb0128} + + + + + + \ No newline at end of file diff --git a/windows/vs13/openexr_b44ExpLogTable.vcxproj.filters b/windows/vs13/openexr_b44ExpLogTable.vcxproj.filters new file mode 100644 index 000000000..5a4845a21 --- /dev/null +++ b/windows/vs13/openexr_b44ExpLogTable.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/openexr_eLut.vcxproj b/windows/vs13/openexr_eLut.vcxproj new file mode 100644 index 000000000..82fdcaf4f --- /dev/null +++ b/windows/vs13/openexr_eLut.vcxproj @@ -0,0 +1,94 @@ + + + + + Release + Win32 + + + Release + x64 + + + + {39C65232-04FB-4622-8283-34829739887C} + Win32Proj + eLut + eLut + + + + Application + false + v120 + + + Application + false + v120 + + + + + + + + + + + + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + eLut + .exe + BscMake + + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + eLut + .exe + BscMake + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + + + "$(TargetPath)" > ..\..\libraries\ilmbase\Half\eLut.h + + + ..\..\libraries\ilmbase\Half\eLut.h + Generating eLut.h... + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + + + "$(TargetPath)" > ..\..\libraries\ilmbase\Half\eLut.h + + + ..\..\libraries\ilmbase\Half\eLut.h + Generating eLut.h... + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/openexr_eLut.vcxproj.filters b/windows/vs13/openexr_eLut.vcxproj.filters new file mode 100644 index 000000000..d59f8b134 --- /dev/null +++ b/windows/vs13/openexr_eLut.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/openexr_toFloat.vcxproj b/windows/vs13/openexr_toFloat.vcxproj new file mode 100644 index 000000000..21e00fe46 --- /dev/null +++ b/windows/vs13/openexr_toFloat.vcxproj @@ -0,0 +1,94 @@ + + + + + Release + Win32 + + + Release + x64 + + + + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB} + Win32Proj + toFloat + toFloat + + + + Application + false + v120 + + + Application + false + v120 + + + + + + + + + + + + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + toFloat + .exe + BscMake + + + build\$(ProjectName)\$(Platform)\$(Configuration)\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + toFloat + .exe + BscMake + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + + + "$(TargetPath)" > ..\..\libraries\ilmbase\Half\toFloat.h + + + ..\..\libraries\ilmbase\Half\toFloat.h + Generating toFloat.h... + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + Console + + + "$(TargetPath)" > ..\..\libraries\ilmbase\Half\toFloat.h + + + ..\..\libraries\ilmbase\Half\toFloat.h + Generating toFloat.h... + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/openexr_toFloat.vcxproj.filters b/windows/vs13/openexr_toFloat.vcxproj.filters new file mode 100644 index 000000000..a29d06b4f --- /dev/null +++ b/windows/vs13/openexr_toFloat.vcxproj.filters @@ -0,0 +1,14 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/povbackend.vcxproj b/windows/vs13/povbackend.vcxproj new file mode 100644 index 000000000..ed8982de9 --- /dev/null +++ b/windows/vs13/povbackend.vcxproj @@ -0,0 +1,471 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F} + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + povbackend32d + povbackend32 + povbackend32-sse2 + povbackend64d + povbackend64 + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Full + AnySuitable + true + Speed + false + false + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/povbackend.vcxproj.filters b/windows/vs13/povbackend.vcxproj.filters new file mode 100644 index 000000000..57a3316ae --- /dev/null +++ b/windows/vs13/povbackend.vcxproj.filters @@ -0,0 +1,403 @@ + + + + + {3eaf32fb-a3d5-430c-8e3b-c85e687cb593} + + + {a90a16a1-de23-4452-8391-ad80d58f9134} + + + + + {37dcbdbc-965f-456a-88ef-94e719c9e899} + + + {3ea739c5-294f-471c-a68b-70a28d905b60} + + + {925d90dc-061b-49d0-a019-392625146379} + + + {b22c9c92-48f1-4112-980c-e207ccad1c32} + + + {bbe704ec-896e-49c8-aac5-66f87fe033a1} + + + {4597a4bd-79eb-455a-9067-ef35ac278ec1} + + + {97a33130-22df-4bd3-b88a-ed2b3622e70e} + + + {4eb01538-921e-45c5-80f5-523ea4298683} + + + {c12878d9-42f7-4dc0-82c4-0c3ffa9524ce} + + + {efe26d90-2df7-4436-9c9c-c96b2a613976} + + + {62ce9b25-12bf-42da-a54c-71a5f67023f6} + + + {00f8c35e-011c-4355-9c1d-da3cb3dd702d} + + + {0bdf61a0-a573-4bee-8f05-eab1024f1fdc} + + + {b69d0461-17ec-477a-a1d2-2113a27f1922} + + + {027db344-63f5-4471-97d3-9ea921b9e56c} + + + {84996b87-deae-4ae5-a01a-de129397d353} + + + {f05be98c-12a6-41c3-8edf-4807d99ccebd} + + + {819550ea-076f-4b0b-b5e9-ff574bdb9261} + + + {39577e8f-4ca6-413f-acaa-51e665721520} + + + {e952c9e4-a8f8-422c-94b5-8a3c8bb6a30f} + + + {7d2e4c81-3e0a-4c87-8ea2-1eb7ff86db26} + + + + + Core source + + + Core source + + + Core source + + + Backend Source + + + Backend Source\Bounding + + + Backend Source\Bounding + + + Backend Source\Bounding + + + Backend Source\Bounding + + + Backend Source\Colour + + + Backend Source\Colour + + + Backend Source\Control + + + Backend Source\Control + + + Backend Source\Control + + + Backend Source\Control + + + Backend Source\Math + + + Backend Source\Math + + + Backend Source\Math + + + Backend Source\Math + + + Backend Source\Math + + + Backend Source\Math + + + Backend Source\Math + + + Backend Source\Render + + + Backend Source\Render + + + Backend Source\Render + + + Backend Source\Render + + + Backend Source\Scene + + + Backend Source\Scene + + + Backend Source\Scene + + + Backend Source\Scene + + + Backend Source\Scene + + + Backend Source\Scene + + + Backend Source\Support + + + Backend Source\Support + + + Backend Source\Support + + + Backend Source\Support + + + Backend Source\Support + + + Backend Source\Support + + + Backend Source\Support + + + Backend Source\Support + + + Backend Source\VM + + + Backend Source\VM + + + Backend Source\Lighting + + + Backend Source\Lighting + + + Backend Source\Lighting + + + Backend Source\Lighting + + + Backend Source\Lighting + + + Backend Source\Lighting + + + Backend Source\Lighting + + + Backend Source\Lighting + + + Backend Source\Lighting + + + Backend Source\Lighting + + + + + + Core Headers + + + Core Headers + + + Core Headers + + + Backend Headers + + + Backend Headers + + + Backend Headers + + + Backend Headers\Bounding + + + Backend Headers\Bounding + + + Backend Headers\Bounding + + + Backend Headers\Bounding + + + Backend Headers\Colour + + + Backend Headers\Colour + + + Backend Headers\Control + + + Backend Headers\Control + + + Backend Headers\Control + + + Backend Headers\Control + + + Backend Headers\Math + + + Backend Headers\Math + + + Backend Headers\Math + + + Backend Headers\Math + + + Backend Headers\Math + + + Backend Headers\Math + + + Backend Headers\Math + + + Backend Headers\Math + + + Backend Headers\Render + + + Backend Headers\Render + + + Backend Headers\Render + + + Backend Headers\Render + + + Backend Headers\Scene + + + Backend Headers\Scene + + + Backend Headers\Scene + + + Backend Headers\Scene + + + Backend Headers\Scene + + + Backend Headers\Scene + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\Support + + + Backend Headers\VM + + + Backend Headers\VM + + + Backend Headers\Lighting + + + Backend Headers\Lighting + + + Backend Headers\Lighting + + + Backend Headers\Lighting + + + Backend Headers\Lighting + + + Backend Headers\Lighting + + + Backend Headers\Lighting + + + Backend Headers\Lighting + + + Backend Headers\Lighting + + + + Backend Headers + + + \ No newline at end of file diff --git a/windows/vs13/povbase.vcxproj b/windows/vs13/povbase.vcxproj new file mode 100644 index 000000000..285b29af1 --- /dev/null +++ b/windows/vs13/povbase.vcxproj @@ -0,0 +1,449 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {C6D9B754-11EB-4FC3-8683-593B2377D043} + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + povbase32d + povbase32 + povbase32-sse2 + povbase64d + povbase64 + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Full + AnySuitable + true + Speed + false + false + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SyncCThrow + SyncCThrow + SyncCThrow + SyncCThrow + SyncCThrow + + + + + SyncCThrow + SyncCThrow + SyncCThrow + SyncCThrow + SyncCThrow + + + + + + + + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/povbase.vcxproj.filters b/windows/vs13/povbase.vcxproj.filters new file mode 100644 index 000000000..692b28c5e --- /dev/null +++ b/windows/vs13/povbase.vcxproj.filters @@ -0,0 +1,251 @@ + + + + + {b19486af-dfce-4a06-90c9-32e3785708c0} + + + {acc09c16-b1ed-4852-adc4-c5d9ee866257} + + + {3299ca4f-6080-43f0-87c9-6a9d10390c15} + + + {b61a7a32-c167-4948-9568-4fadf771f1bd} + + + {ddfe4b58-8acd-4025-bfaf-18bf81359f9b} + + + {d5a32d03-c8d0-4ef2-af6b-b1c14e818dec} + + + {9342c598-21d7-47b7-ae5a-013c3680a3bc} + + + {9f44d3c5-81d8-4017-a1b7-5a6f9a139e28} + + + + + Base source + + + Base source + + + Base source + + + Base source + + + Base source + + + Base source + + + Base source + + + Base source + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Image + + + Base source\Animation + + + Base source\Animation + + + + Base source\Font + + + Base source\Font + + + Base source\Font + + + Base source\Font + + + Base source + + + Base source + + + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Image + + + Base Headers\Animation + + + Base Headers\Animation + + + + Base Headers + + + Base Headers\Font + + + Base Headers\Font + + + Base Headers\Font + + + Base Headers\Font + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + Base Headers + + + \ No newline at end of file diff --git a/windows/vs13/povcore.vcxproj b/windows/vs13/povcore.vcxproj new file mode 100644 index 000000000..1e172d09c --- /dev/null +++ b/windows/vs13/povcore.vcxproj @@ -0,0 +1,436 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5} + pov_core + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + povcore32d + povcore32 + povcore32-sse2 + povcore64d + povcore64 + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Full + AnySuitable + true + Speed + false + false + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/povcore.vcxproj.filters b/windows/vs13/povcore.vcxproj.filters new file mode 100644 index 000000000..6d993e487 --- /dev/null +++ b/windows/vs13/povcore.vcxproj.filters @@ -0,0 +1,250 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h + + + {f7a33702-7a7f-4306-aa9f-67c03872ef9a} + + + {7a9b8c40-020d-45d1-86e1-4bd85db7f00a} + + + {c23b2412-544e-4b7c-94d9-fa9d93b089fd} + + + {b6ba5b2d-3c3d-4b83-8fc6-de656baaf2e3} + + + {97bdaec2-4a5c-4947-8c37-d2551b11d346} + + + {d4a077b2-598b-470c-9fa1-0d2de7c70925} + + + + + + Core Source\Material + + + Core Source\Material + + + Core Source\Material + + + Core Source\Material + + + Core Source\Material + + + Core Source\Material + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Shape + + + Core Source\Material + + + Core Source\Render + + + Core Source\Render + + + + + + Core Headers + + + Core Headers + + + Core Headers + + + Core Headers\Material + + + Core Headers\Material + + + Core Headers\Material + + + Core Headers\Material + + + Core Headers\Material + + + Core Headers\Material + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Shape + + + Core Headers\Material + + + Core Headers\Render + + + Core Headers\Render + + + \ No newline at end of file diff --git a/windows/vs13/povfrontend.vcxproj b/windows/vs13/povfrontend.vcxproj new file mode 100644 index 000000000..f8b9e575e --- /dev/null +++ b/windows/vs13/povfrontend.vcxproj @@ -0,0 +1,393 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {C6D9B754-11EB-4FC3-8683-593BFD58C904} + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + povfrontend32d + povfrontend32 + povfrontend32-sse2 + povfrontend64d + povfrontend64 + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Full + AnySuitable + true + Speed + false + false + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/povfrontend.vcxproj.filters b/windows/vs13/povfrontend.vcxproj.filters new file mode 100644 index 000000000..bf347edfe --- /dev/null +++ b/windows/vs13/povfrontend.vcxproj.filters @@ -0,0 +1,101 @@ + + + + + {0c69e0ec-801c-46f2-9743-e5449ef0a9c3} + + + {58640af2-49b2-4046-bebc-2352377ade12} + + + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + Frontend source + + + + Frontend source + + + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + Frontend Headers + + + + Frontend Headers + + + \ No newline at end of file diff --git a/windows/vs13/povms.vcxproj b/windows/vs13/povms.vcxproj new file mode 100644 index 000000000..d85f0648a --- /dev/null +++ b/windows/vs13/povms.vcxproj @@ -0,0 +1,374 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {B1E68128-84D7-4525-A3C1-E6C1077F2239} + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + povms32d + povms32 + povms32-sse2 + povms64d + povms64 + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Full + AnySuitable + true + Speed + false + false + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\openexr\IlmImf;..\..\libraries\ilmbase\Half;..\..\libraries\ilmbase\Imath;..\..\libraries\ilmbase\Iex;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NON_UNIX_OPENEXR_HEADERS;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + + + + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/povms.vcxproj.filters b/windows/vs13/povms.vcxproj.filters new file mode 100644 index 000000000..68ee09b9f --- /dev/null +++ b/windows/vs13/povms.vcxproj.filters @@ -0,0 +1,44 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + + + + + + POVMS Source + + + POVMS Source + + + POVMS Source + + + + + POVMS Headers + + + + POVMS Headers + + + POVMS Headers + + + POVMS Headers + + + POVMS Headers + + + POVMS Headers + + + \ No newline at end of file diff --git a/windows/vs13/povparser.vcxproj b/windows/vs13/povparser.vcxproj new file mode 100644 index 000000000..7b43b0f59 --- /dev/null +++ b/windows/vs13/povparser.vcxproj @@ -0,0 +1,379 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664} + pov_parser + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + povparser32d + povparser32 + povparser32-sse2 + povparser64d + povparser64 + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Full + AnySuitable + true + Speed + false + false + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + + + + + + Create + Create + Create + Create + Create + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/povparser.vcxproj.filters b/windows/vs13/povparser.vcxproj.filters new file mode 100644 index 000000000..4496b3528 --- /dev/null +++ b/windows/vs13/povparser.vcxproj.filters @@ -0,0 +1,63 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + + + + + + + + Parser Headers + + + Parser Headers + + + Parser Headers + + + Parser Headers + + + Parser Headers + + + + + + Parser Source + + + Parser Source + + + Parser Source + + + Parser Source + + + Parser Source + + + Parser Source + + + Parser Source + + + Parser Source + + + Parser Source + + + \ No newline at end of file diff --git a/windows/vs13/povplatform.vcxproj b/windows/vs13/povplatform.vcxproj new file mode 100644 index 000000000..8b009ecf1 --- /dev/null +++ b/windows/vs13/povplatform.vcxproj @@ -0,0 +1,369 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D} + povplatform + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + povplatform32d + povplatform32 + povplatform32-sse2 + povplatform64d + povplatform64 + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalLibraryDirectories) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Full + AnySuitable + true + Speed + false + false + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + NotSet + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + false + false + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + Precise + false + true + true + Use + precomp.h + $(IntDir)precomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;4355;%(DisableSpecificWarnings) + precomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)$(TargetName)$(TargetExt) + + + + + + + Create + Create + Create + Create + Create + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/povplatform.vcxproj.filters b/windows/vs13/povplatform.vcxproj.filters new file mode 100644 index 000000000..213c212e8 --- /dev/null +++ b/windows/vs13/povplatform.vcxproj.filters @@ -0,0 +1,33 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + + + + + + + + Platform Source + + + Platform Source + + + + + + Platform Headers + + + Platform Headers + + + \ No newline at end of file diff --git a/windows/vs13/povray.sln b/windows/vs13/povray.sln new file mode 100644 index 000000000..e41b76894 --- /dev/null +++ b/windows/vs13/povray.sln @@ -0,0 +1,418 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Image Libraries", "Image Libraries", "{4178148C-8A0C-4EB0-ACD9-0E09676F2700}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Generic POV-Ray", "Generic POV-Ray", "{5319B36D-2906-4EAF-B623-B7C04F3CC2AD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VFE", "VFE", "{4A043885-D401-40B2-9375-1C57136F03F6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows Targets", "Windows Targets", "{CB0679D3-62C5-4328-B49F-504E0AA9C65A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUI", "povray.vcxproj", "{9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}" + ProjectSection(ProjectDependencies) = postProject + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D} = {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D} + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5} = {7F9DA615-40A3-43A0-B8BB-528698DDE6E5} + {37FDEA25-43CD-4AF0-A232-281E11851E75} = {37FDEA25-43CD-4AF0-A232-281E11851E75} + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664} = {F0304A28-E1C7-4F4F-BE1F-DF57936C9664} + {B1E68128-84D7-4525-A3C1-E6C1077F2239} = {B1E68128-84D7-4525-A3C1-E6C1077F2239} + {35A2DC31-84BC-4F7A-9C93-1D072432AD79} = {35A2DC31-84BC-4F7A-9C93-1D072432AD79} + {10B193D4-E27B-4438-A825-BFB3D2B4C74D} = {10B193D4-E27B-4438-A825-BFB3D2B4C74D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "jpeg.vcxproj", "{3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng.vcxproj", "{E1EA88AF-6B44-4225-B97B-B485FC9DB23E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "tiff.vcxproj", "{186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{8BB067C4-7135-4643-863C-49C520BEEA01}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfewin", "vfewin.vcxproj", "{72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtrsupport", "rtrsupport.vcxproj", "{851C772C-D7C2-4EE3-A90C-23386F0E9897}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console", "console.vcxproj", "{3B6BB403-FC72-45FF-A431-9295A1AEB7A3}" + ProjectSection(ProjectDependencies) = postProject + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128} = {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128} + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E} = {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E} + {76ADDB29-9C6A-442C-9BA9-764C050F75DD} = {76ADDB29-9C6A-442C-9BA9-764C050F75DD} + {851C772C-D7C2-4EE3-A90C-23386F0E9897} = {851C772C-D7C2-4EE3-A90C-23386F0E9897} + {35A2DC31-84BC-4F7A-9C93-1D072432AD79} = {35A2DC31-84BC-4F7A-9C93-1D072432AD79} + {C46B9A53-86D8-4B7F-AB15-B2C04518A195} = {C46B9A53-86D8-4B7F-AB15-B2C04518A195} + {C6D9B754-11EB-4FC3-8683-593B2377D043} = {C6D9B754-11EB-4FC3-8683-593B2377D043} + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F} = {C6D9B754-11EB-4FC3-8683-593B53E9AD1F} + {10B193D4-E27B-4438-A825-BFB3D2B4C74D} = {10B193D4-E27B-4438-A825-BFB3D2B4C74D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "povbackend", "povbackend.vcxproj", "{C6D9B754-11EB-4FC3-8683-593B53E9AD1F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "povbase", "povbase.vcxproj", "{C6D9B754-11EB-4FC3-8683-593B2377D043}" + ProjectSection(ProjectDependencies) = postProject + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7} = {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "povfrontend", "povfrontend.vcxproj", "{C6D9B754-11EB-4FC3-8683-593BFD58C904}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boost Libraries", "Boost Libraries", "{31AFDB3C-8769-49DF-9C9E-2013E194D983}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_thread", "boost_thread.vcxproj", "{10B193D4-E27B-4438-A825-BFB3D2B4C74D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boost_date_time", "boost_date_time.vcxproj", "{35A2DC31-84BC-4F7A-9C93-1D072432AD79}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenEXR Libraries", "OpenEXR Libraries", "{30F7FB89-B9D5-473E-A14D-6A00700C1EA9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IlmImf", "openexr_IlmImf.vcxproj", "{7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}" + ProjectSection(ProjectDependencies) = postProject + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7} = {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Iex", "openexr_Iex.vcxproj", "{C46B9A53-86D8-4B7F-AB15-B2C04518A195}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IlmThread", "openexr_IlmThread.vcxproj", "{76ADDB29-9C6A-442C-9BA9-764C050F75DD}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Half", "openexr_Half.vcxproj", "{9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}" + ProjectSection(ProjectDependencies) = postProject + {39C65232-04FB-4622-8283-34829739887C} = {39C65232-04FB-4622-8283-34829739887C} + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB} = {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eLut", "openexr_eLut.vcxproj", "{39C65232-04FB-4622-8283-34829739887C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "b44ExpLogTable", "openexr_b44ExpLogTable.vcxproj", "{38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}" + ProjectSection(ProjectDependencies) = postProject + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128} = {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toFloat", "openexr_toFloat.vcxproj", "{9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmedit", "cmedit.vcxproj", "{37FDEA25-43CD-4AF0-A232-281E11851E75}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests", "tests.vcxproj", "{86D92BC4-4C57-42D1-9F63-26ABF811715B}" + ProjectSection(ProjectDependencies) = postProject + {C6D9B754-11EB-4FC3-8683-593B2377D043} = {C6D9B754-11EB-4FC3-8683-593B2377D043} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "povcore", "povcore.vcxproj", "{7F9DA615-40A3-43A0-B8BB-528698DDE6E5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "povparser", "povparser.vcxproj", "{F0304A28-E1C7-4F4F-BE1F-DF57936C9664}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "povms", "povms.vcxproj", "{B1E68128-84D7-4525-A3C1-E6C1077F2239}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "povplatform", "povplatform.vcxproj", "{0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + Release-SSE2|Win32 = Release-SSE2|Win32 + Release-SSE2|x64 = Release-SSE2|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Debug|Win32.ActiveCfg = Debug|Win32 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Debug|Win32.Build.0 = Debug|Win32 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Debug|x64.ActiveCfg = Debug|x64 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Debug|x64.Build.0 = Debug|x64 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Release|Win32.ActiveCfg = Release|Win32 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Release|Win32.Build.0 = Release|Win32 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Release|x64.ActiveCfg = Release|x64 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Release|x64.Build.0 = Release|x64 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Debug|Win32.Build.0 = Debug|Win32 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Debug|x64.ActiveCfg = Debug|x64 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Debug|x64.Build.0 = Debug|x64 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Release|Win32.ActiveCfg = Release|Win32 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Release|Win32.Build.0 = Release|Win32 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Release|x64.ActiveCfg = Release|x64 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Release|x64.Build.0 = Release|x64 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Debug|Win32.ActiveCfg = Debug|Win32 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Debug|Win32.Build.0 = Debug|Win32 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Debug|x64.ActiveCfg = Debug|x64 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Debug|x64.Build.0 = Debug|x64 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Release|Win32.ActiveCfg = Release|Win32 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Release|Win32.Build.0 = Release|Win32 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Release|x64.ActiveCfg = Release|x64 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Release|x64.Build.0 = Release|x64 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Debug|Win32.ActiveCfg = Debug|Win32 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Debug|Win32.Build.0 = Debug|Win32 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Debug|x64.ActiveCfg = Debug|x64 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Debug|x64.Build.0 = Debug|x64 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Release|Win32.ActiveCfg = Release|Win32 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Release|Win32.Build.0 = Release|Win32 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Release|x64.ActiveCfg = Release|x64 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Release|x64.Build.0 = Release|x64 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Debug|Win32.ActiveCfg = Debug|Win32 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Debug|Win32.Build.0 = Debug|Win32 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Debug|x64.ActiveCfg = Debug|x64 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Debug|x64.Build.0 = Debug|x64 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Release|Win32.ActiveCfg = Release|Win32 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Release|Win32.Build.0 = Release|Win32 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Release|x64.ActiveCfg = Release|x64 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Release|x64.Build.0 = Release|x64 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {8BB067C4-7135-4643-863C-49C520BEEA01}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Debug|Win32.ActiveCfg = Debug|Win32 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Debug|Win32.Build.0 = Debug|Win32 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Debug|x64.ActiveCfg = Debug|x64 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Debug|x64.Build.0 = Debug|x64 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Release|Win32.ActiveCfg = Release|Win32 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Release|Win32.Build.0 = Release|Win32 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Release|x64.ActiveCfg = Release|x64 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Release|x64.Build.0 = Release|x64 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Debug|Win32.ActiveCfg = Debug|Win32 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Debug|Win32.Build.0 = Debug|Win32 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Debug|x64.ActiveCfg = Debug|x64 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Debug|x64.Build.0 = Debug|x64 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Release|Win32.ActiveCfg = Release|Win32 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Release|Win32.Build.0 = Release|Win32 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Release|x64.ActiveCfg = Release|x64 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Release|x64.Build.0 = Release|x64 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {851C772C-D7C2-4EE3-A90C-23386F0E9897}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {3B6BB403-FC72-45FF-A431-9295A1AEB7A3}.Debug|Win32.ActiveCfg = Debug|Win32 + {3B6BB403-FC72-45FF-A431-9295A1AEB7A3}.Debug|x64.ActiveCfg = Debug|x64 + {3B6BB403-FC72-45FF-A431-9295A1AEB7A3}.Release|Win32.ActiveCfg = Release|Win32 + {3B6BB403-FC72-45FF-A431-9295A1AEB7A3}.Release|x64.ActiveCfg = Release|x64 + {3B6BB403-FC72-45FF-A431-9295A1AEB7A3}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {3B6BB403-FC72-45FF-A431-9295A1AEB7A3}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Debug|Win32.ActiveCfg = Debug|Win32 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Debug|Win32.Build.0 = Debug|Win32 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Debug|x64.ActiveCfg = Debug|x64 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Debug|x64.Build.0 = Debug|x64 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Release|Win32.ActiveCfg = Release|Win32 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Release|Win32.Build.0 = Release|Win32 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Release|x64.ActiveCfg = Release|x64 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Release|x64.Build.0 = Release|x64 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Debug|Win32.ActiveCfg = Debug|Win32 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Debug|Win32.Build.0 = Debug|Win32 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Debug|x64.ActiveCfg = Debug|x64 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Debug|x64.Build.0 = Debug|x64 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Release|Win32.ActiveCfg = Release|Win32 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Release|Win32.Build.0 = Release|Win32 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Release|x64.ActiveCfg = Release|x64 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Release|x64.Build.0 = Release|x64 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593B2377D043}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Debug|Win32.ActiveCfg = Debug|Win32 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Debug|Win32.Build.0 = Debug|Win32 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Debug|x64.ActiveCfg = Debug|x64 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Debug|x64.Build.0 = Debug|x64 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Release|Win32.ActiveCfg = Release|Win32 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Release|Win32.Build.0 = Release|Win32 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Release|x64.ActiveCfg = Release|x64 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Release|x64.Build.0 = Release|x64 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {C6D9B754-11EB-4FC3-8683-593BFD58C904}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Debug|Win32.ActiveCfg = Debug|Win32 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Debug|Win32.Build.0 = Debug|Win32 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Debug|x64.ActiveCfg = Debug|x64 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Debug|x64.Build.0 = Debug|x64 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Release|Win32.ActiveCfg = Release|Win32 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Release|Win32.Build.0 = Release|Win32 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Release|x64.ActiveCfg = Release|x64 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Release|x64.Build.0 = Release|x64 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {10B193D4-E27B-4438-A825-BFB3D2B4C74D}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Debug|Win32.ActiveCfg = Debug|Win32 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Debug|Win32.Build.0 = Debug|Win32 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Debug|x64.ActiveCfg = Debug|x64 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Debug|x64.Build.0 = Debug|x64 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Release|Win32.ActiveCfg = Release|Win32 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Release|Win32.Build.0 = Release|Win32 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Release|x64.ActiveCfg = Release|x64 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Release|x64.Build.0 = Release|x64 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {35A2DC31-84BC-4F7A-9C93-1D072432AD79}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Debug|Win32.ActiveCfg = Debug|Win32 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Debug|Win32.Build.0 = Debug|Win32 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Debug|x64.ActiveCfg = Debug|x64 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Debug|x64.Build.0 = Debug|x64 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Release|Win32.ActiveCfg = Release|Win32 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Release|Win32.Build.0 = Release|Win32 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Release|x64.ActiveCfg = Release|x64 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Release|x64.Build.0 = Release|x64 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Debug|Win32.ActiveCfg = Debug|Win32 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Debug|Win32.Build.0 = Debug|Win32 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Debug|x64.ActiveCfg = Debug|x64 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Debug|x64.Build.0 = Debug|x64 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Release|Win32.ActiveCfg = Release|Win32 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Release|Win32.Build.0 = Release|Win32 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Release|x64.ActiveCfg = Release|x64 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Release|x64.Build.0 = Release|x64 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {C46B9A53-86D8-4B7F-AB15-B2C04518A195}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Debug|Win32.ActiveCfg = Debug|Win32 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Debug|Win32.Build.0 = Debug|Win32 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Debug|x64.ActiveCfg = Debug|x64 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Debug|x64.Build.0 = Debug|x64 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Release|Win32.ActiveCfg = Release|Win32 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Release|Win32.Build.0 = Release|Win32 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Release|x64.ActiveCfg = Release|x64 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Release|x64.Build.0 = Release|x64 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {76ADDB29-9C6A-442C-9BA9-764C050F75DD}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Debug|Win32.ActiveCfg = Debug|Win32 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Debug|Win32.Build.0 = Debug|Win32 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Debug|x64.ActiveCfg = Debug|x64 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Debug|x64.Build.0 = Debug|x64 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Release|Win32.ActiveCfg = Release|Win32 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Release|Win32.Build.0 = Release|Win32 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Release|x64.ActiveCfg = Release|x64 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Release|x64.Build.0 = Release|x64 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {39C65232-04FB-4622-8283-34829739887C}.Debug|Win32.ActiveCfg = Release|Win32 + {39C65232-04FB-4622-8283-34829739887C}.Debug|Win32.Build.0 = Release|Win32 + {39C65232-04FB-4622-8283-34829739887C}.Debug|x64.ActiveCfg = Release|x64 + {39C65232-04FB-4622-8283-34829739887C}.Debug|x64.Build.0 = Release|x64 + {39C65232-04FB-4622-8283-34829739887C}.Release|Win32.ActiveCfg = Release|Win32 + {39C65232-04FB-4622-8283-34829739887C}.Release|Win32.Build.0 = Release|Win32 + {39C65232-04FB-4622-8283-34829739887C}.Release|x64.ActiveCfg = Release|x64 + {39C65232-04FB-4622-8283-34829739887C}.Release|x64.Build.0 = Release|x64 + {39C65232-04FB-4622-8283-34829739887C}.Release-SSE2|Win32.ActiveCfg = Release|Win32 + {39C65232-04FB-4622-8283-34829739887C}.Release-SSE2|Win32.Build.0 = Release|Win32 + {39C65232-04FB-4622-8283-34829739887C}.Release-SSE2|x64.ActiveCfg = Release|x64 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Debug|Win32.ActiveCfg = Debug|Win32 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Debug|Win32.Build.0 = Debug|Win32 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Debug|x64.ActiveCfg = Debug|x64 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Debug|x64.Build.0 = Debug|x64 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Release|Win32.ActiveCfg = Release|Win32 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Release|Win32.Build.0 = Release|Win32 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Release|x64.ActiveCfg = Release|x64 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Release|x64.Build.0 = Release|x64 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Release-SSE2|Win32.ActiveCfg = Release|Win32 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Release-SSE2|Win32.Build.0 = Release|Win32 + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7}.Release-SSE2|x64.ActiveCfg = Release|x64 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Debug|Win32.ActiveCfg = Release|Win32 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Debug|Win32.Build.0 = Release|Win32 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Debug|x64.ActiveCfg = Release|x64 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Debug|x64.Build.0 = Release|x64 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Release|Win32.ActiveCfg = Release|Win32 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Release|Win32.Build.0 = Release|Win32 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Release|x64.ActiveCfg = Release|x64 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Release|x64.Build.0 = Release|x64 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Release-SSE2|Win32.ActiveCfg = Release|Win32 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Release-SSE2|Win32.Build.0 = Release|Win32 + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB}.Release-SSE2|x64.ActiveCfg = Release|x64 + {37FDEA25-43CD-4AF0-A232-281E11851E75}.Debug|Win32.ActiveCfg = Debug|Win32 + {37FDEA25-43CD-4AF0-A232-281E11851E75}.Debug|x64.ActiveCfg = Debug|x64 + {37FDEA25-43CD-4AF0-A232-281E11851E75}.Release|Win32.ActiveCfg = Release|Win32 + {37FDEA25-43CD-4AF0-A232-281E11851E75}.Release|x64.ActiveCfg = Release|x64 + {37FDEA25-43CD-4AF0-A232-281E11851E75}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {37FDEA25-43CD-4AF0-A232-281E11851E75}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {86D92BC4-4C57-42D1-9F63-26ABF811715B}.Debug|Win32.ActiveCfg = Debug|Win32 + {86D92BC4-4C57-42D1-9F63-26ABF811715B}.Debug|x64.ActiveCfg = Debug|x64 + {86D92BC4-4C57-42D1-9F63-26ABF811715B}.Release|Win32.ActiveCfg = Debug|x64 + {86D92BC4-4C57-42D1-9F63-26ABF811715B}.Release|x64.ActiveCfg = Debug|x64 + {86D92BC4-4C57-42D1-9F63-26ABF811715B}.Release-SSE2|Win32.ActiveCfg = Debug|x64 + {86D92BC4-4C57-42D1-9F63-26ABF811715B}.Release-SSE2|x64.ActiveCfg = Debug|x64 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Debug|Win32.ActiveCfg = Debug|Win32 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Debug|Win32.Build.0 = Debug|Win32 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Debug|x64.ActiveCfg = Debug|x64 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Debug|x64.Build.0 = Debug|x64 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Release|Win32.ActiveCfg = Release|Win32 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Release|Win32.Build.0 = Release|Win32 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Release|x64.ActiveCfg = Release|x64 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Release|x64.Build.0 = Release|x64 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Debug|Win32.ActiveCfg = Debug|Win32 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Debug|Win32.Build.0 = Debug|Win32 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Debug|x64.ActiveCfg = Debug|x64 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Debug|x64.Build.0 = Debug|x64 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Release|Win32.ActiveCfg = Release|Win32 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Release|Win32.Build.0 = Release|Win32 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Release|x64.ActiveCfg = Release|x64 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Release|x64.Build.0 = Release|x64 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Debug|Win32.ActiveCfg = Debug|Win32 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Debug|Win32.Build.0 = Debug|Win32 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Debug|x64.ActiveCfg = Debug|x64 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Debug|x64.Build.0 = Debug|x64 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Release|Win32.ActiveCfg = Release|Win32 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Release|Win32.Build.0 = Release|Win32 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Release|x64.ActiveCfg = Release|x64 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Release|x64.Build.0 = Release|x64 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {B1E68128-84D7-4525-A3C1-E6C1077F2239}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Debug|Win32.Build.0 = Debug|Win32 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Debug|x64.ActiveCfg = Debug|x64 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Debug|x64.Build.0 = Debug|x64 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Release|Win32.ActiveCfg = Release|Win32 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Release|Win32.Build.0 = Release|Win32 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Release|x64.ActiveCfg = Release|x64 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Release|x64.Build.0 = Release|x64 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Release-SSE2|Win32.ActiveCfg = Release-SSE2|Win32 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Release-SSE2|Win32.Build.0 = Release-SSE2|Win32 + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D}.Release-SSE2|x64.ActiveCfg = Release-SSE2|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570} = {CB0679D3-62C5-4328-B49F-504E0AA9C65A} + {3780CCDE-4967-4C31-B6A3-3C2570BDD3E4} = {4178148C-8A0C-4EB0-ACD9-0E09676F2700} + {E1EA88AF-6B44-4225-B97B-B485FC9DB23E} = {4178148C-8A0C-4EB0-ACD9-0E09676F2700} + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7} = {4178148C-8A0C-4EB0-ACD9-0E09676F2700} + {8BB067C4-7135-4643-863C-49C520BEEA01} = {4178148C-8A0C-4EB0-ACD9-0E09676F2700} + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C} = {4A043885-D401-40B2-9375-1C57136F03F6} + {851C772C-D7C2-4EE3-A90C-23386F0E9897} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + {3B6BB403-FC72-45FF-A431-9295A1AEB7A3} = {CB0679D3-62C5-4328-B49F-504E0AA9C65A} + {C6D9B754-11EB-4FC3-8683-593B53E9AD1F} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + {C6D9B754-11EB-4FC3-8683-593B2377D043} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + {C6D9B754-11EB-4FC3-8683-593BFD58C904} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + {10B193D4-E27B-4438-A825-BFB3D2B4C74D} = {31AFDB3C-8769-49DF-9C9E-2013E194D983} + {35A2DC31-84BC-4F7A-9C93-1D072432AD79} = {31AFDB3C-8769-49DF-9C9E-2013E194D983} + {7DF42126-D237-41D3-9ABE-A3ACC8BAC56E} = {30F7FB89-B9D5-473E-A14D-6A00700C1EA9} + {C46B9A53-86D8-4B7F-AB15-B2C04518A195} = {30F7FB89-B9D5-473E-A14D-6A00700C1EA9} + {76ADDB29-9C6A-442C-9BA9-764C050F75DD} = {30F7FB89-B9D5-473E-A14D-6A00700C1EA9} + {9EDB5C0F-BFD0-4A59-BB93-F06A52BB0128} = {30F7FB89-B9D5-473E-A14D-6A00700C1EA9} + {39C65232-04FB-4622-8283-34829739887C} = {30F7FB89-B9D5-473E-A14D-6A00700C1EA9} + {38B354EC-3DF5-4464-ADDA-E1EFAA55B3F7} = {30F7FB89-B9D5-473E-A14D-6A00700C1EA9} + {9801D5FF-C1E0-46C5-A73E-47DEECE99DDB} = {30F7FB89-B9D5-473E-A14D-6A00700C1EA9} + {37FDEA25-43CD-4AF0-A232-281E11851E75} = {CB0679D3-62C5-4328-B49F-504E0AA9C65A} + {86D92BC4-4C57-42D1-9F63-26ABF811715B} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + {7F9DA615-40A3-43A0-B8BB-528698DDE6E5} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + {F0304A28-E1C7-4F4F-BE1F-DF57936C9664} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + {B1E68128-84D7-4525-A3C1-E6C1077F2239} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + {0C227B07-1830-4C5B-8D4E-2DEFFFD2792D} = {5319B36D-2906-4EAF-B623-B7C04F3CC2AD} + EndGlobalSection +EndGlobal diff --git a/windows/vs13/povray.vcxproj b/windows/vs13/povray.vcxproj new file mode 100644 index 000000000..8e7e48671 --- /dev/null +++ b/windows/vs13/povray.vcxproj @@ -0,0 +1,622 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + GUI + {9BA806FC-C022-4ACF-A3F1-3EC8CAB45570} + povwin + + + + Application + false + true + v120 + + + Application + false + true + v120 + + + Application + false + v120 + + + Application + false + true + v120 + + + Application + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + pvengine32d + pvengine32 + pvengine32-sse2 + pvengine64d + pvengine64 + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0501;_WIN32_WINNT=0x0501;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + true + true + Use + winprecomp.h + $(IntDir)winprecomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + comctl32.lib;gdi32.lib;user32.lib;kernel32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies) + NotSet + true + false + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(TargetName).pdb + Windows + 8388608 + true + POVWINStartup + false + false + false + + + MachineX86 + + + ..\pvengine32.manifest;%(AdditionalManifestFiles) + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Disabled + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions) + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + winprecomp.h + $(IntDir)winprecomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + comctl32.lib;gdi32.lib;user32.lib;kernel32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies) + true + false + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(TargetName).pdb + Windows + 67108864 + true + POVWINStartup + false + false + false + + + MachineX64 + + + ..\pvengine64.manifest;%(AdditionalManifestFiles) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0501;_WIN32_WINNT=0x0501;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + NotSet + Precise + true + true + Use + winprecomp.h + $(IntDir)winprecomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + comctl32.lib;gdi32.lib;user32.lib;kernel32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(TargetName).pdb + Windows + 8388608 + true + POVWINStartup + true + false + false + + + MachineX86 + + + ..\pvengine32.manifest;%(AdditionalManifestFiles) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + + + + + Full + AnySuitable + true + Speed + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0501;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + NotSet + Precise + true + true + Use + winprecomp.h + $(IntDir)winprecomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + comctl32.lib;gdi32.lib;user32.lib;kernel32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies) + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(TargetName).pdb + Windows + 67108864 + true + POVWINStartup + true + false + false + + + MachineX64 + + + ..\pvengine64.manifest;%(AdditionalManifestFiles) + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + + + + + Full + AnySuitable + true + Speed + true + ..\..\platform\x86;..\..\windows\povconfig;..\..\libraries\boost;..\rtrsupport;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0501;_WIN32_WINNT=0x0501;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILD_SSE2=1;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + StreamingSIMDExtensions2 + true + true + Use + winprecomp.h + $(IntDir)winprecomp.pch + true + $(IntDir) + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + winprecomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + comctl32.lib;gdi32.lib;user32.lib;kernel32.lib;advapi32.lib;shell32.lib;%(AdditionalDependencies) + NotSet + true + %(IgnoreSpecificDefaultLibraries) + true + $(OutDir)$(TargetName).pdb + Windows + 8388608 + true + POVWINStartup + true + false + false + + + MachineX86 + + + ..\pvengine32.manifest;%(AdditionalManifestFiles) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + + + + + {c46b9a53-86d8-4b7f-ab15-b2c04518a195} + + + {76addb29-9c6a-442c-9ba9-764c050f75dd} + + + {7df42126-d237-41d3-9abe-a3acc8bac56e} + + + {35a2dc31-84bc-4f7a-9c93-1d072432ad79} + + + {10b193d4-e27b-4438-a825-bfb3d2b4c74d} + + + {9edb5c0f-bfd0-4a59-bb93-f06a52bb0128} + + + {3780ccde-4967-4c31-b6a3-3c2570bdd3e4} + false + + + {e1ea88af-6b44-4225-b97b-b485fc9db23e} + false + + + {c6d9b754-11eb-4fc3-8683-593b53e9ad1f} + false + + + {c6d9b754-11eb-4fc3-8683-593b2377d043} + false + + + {7f9da615-40a3-43a0-b8bb-528698dde6e5} + + + {c6d9b754-11eb-4fc3-8683-593bfd58c904} + false + + + {b1e68128-84d7-4525-a3c1-e6c1077f2239} + + + {f0304a28-e1c7-4f4f-be1f-df57936c9664} + + + {0c227b07-1830-4c5b-8d4e-2defffd2792d} + + + {851c772c-d7c2-4ee3-a90c-23386f0e9897} + false + + + {186baef6-cf24-42c1-8ce3-25590cb9f6e7} + false + + + {72793df1-d4af-4aa0-a606-7b51ed2a3f5c} + false + + + {8bb067c4-7135-4643-863c-49c520beea01} + false + + + + + + \ No newline at end of file diff --git a/windows/vs13/povray.vcxproj.filters b/windows/vs13/povray.vcxproj.filters new file mode 100644 index 000000000..0ae7638f9 --- /dev/null +++ b/windows/vs13/povray.vcxproj.filters @@ -0,0 +1,267 @@ + + + + + {9ee610c7-4fa9-4ab7-8414-d1129c0cb4c7} + + + {17236962-9406-4bed-a1ee-0e0e649a0cb3} + *.bmp + + + {90b6ce8a-dc01-4cad-a954-9ffb99251dfb} + *.h + + + {b4c844cc-f3b1-4765-8c77-911f3b2d69b2} + + + + + Resources + + + Resources + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + Resources\Bitmaps + + + + + + Resources + + + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers + + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + + \ No newline at end of file diff --git a/windows/vs13/rtrsupport.vcxproj b/windows/vs13/rtrsupport.vcxproj new file mode 100644 index 000000000..e0b753b1f --- /dev/null +++ b/windows/vs13/rtrsupport.vcxproj @@ -0,0 +1,344 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {851C772C-D7C2-4EE3-A90C-23386F0E9897} + rtrsupport + + + + StaticLibrary + false + + + true + v120 + + + StaticLibrary + false + + + true + v120 + + + StaticLibrary + false + + + v120 + + + StaticLibrary + false + + + true + v120 + + + StaticLibrary + false + + + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + rtrsupport32d + rtrsupport32 + rtrsupport32-sse2 + rtrsupport64d + rtrsupport64 + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + false + + + Disabled + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;_DEBUG;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_DCOM;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + + + true + $(IntDir) + Level3 + ProgramDatabase + 4995;%(DisableSpecificWarnings) + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c09 + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + false + X64 + + + Disabled + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;_DEBUG;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_DCOM;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;_SECURE_SCL=0;BUILDING_AMD64;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + Default + MultiThreadedDebug + false + + + true + $(IntDir) + Level3 + ProgramDatabase + 4995;%(DisableSpecificWarnings) + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x0c09 + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + false + + + Full + true + true + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;NDEBUG;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_DCOM;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + false + NotSet + + + true + $(IntDir) + Level3 + ProgramDatabase + 4995;%(DisableSpecificWarnings) + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c09 + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + false + X64 + + + Full + true + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;NDEBUG;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_DCOM;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;BUILDING_AMD64;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + false + + + true + $(IntDir) + Level3 + ProgramDatabase + 4995;%(DisableSpecificWarnings) + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c09 + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + false + + + Full + true + true + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;NDEBUG;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_CRT_NON_CONFORMING_SWPRINTFS;_WIN32_DCOM;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + false + StreamingSIMDExtensions2 + + + true + $(IntDir) + Level3 + ProgramDatabase + 4995;%(DisableSpecificWarnings) + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0c09 + $(IntDir);%(AdditionalIncludeDirectories) + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/rtrsupport.vcxproj.filters b/windows/vs13/rtrsupport.vcxproj.filters new file mode 100644 index 000000000..ff7811881 --- /dev/null +++ b/windows/vs13/rtrsupport.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/windows/vs13/tests.vcxproj b/windows/vs13/tests.vcxproj new file mode 100644 index 000000000..225cfc57a --- /dev/null +++ b/windows/vs13/tests.vcxproj @@ -0,0 +1,107 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + + {86D92BC4-4C57-42D1-9F63-26ABF811715B} + tests + + + + Application + true + MultiByte + v120 + + + Application + true + MultiByte + v120 + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + povtests32d + povtests64d + + + + Disabled + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\source\tests;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + Async + MultiThreadedDebug + Level3 + + + true + Console + MachineX86 + + + "$(TargetPath)" --result_code=no --report_level=no --catch_system_errors=no + + + Running Unit Tests + + + + + X64 + + + Disabled + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win;..\..\vfe;..\;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\source\tests;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions) + Async + MultiThreadedDebug + Level3 + + + true + Console + MachineX64 + + + "$(TargetPath)" --result_code=no --report_level=no --catch_system_errors=no + + + Running Unit Tests + + + + + {c6d9b754-11eb-4fc3-8683-593b2377d043} + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/tests.vcxproj.filters b/windows/vs13/tests.vcxproj.filters new file mode 100644 index 000000000..5ec3dce86 --- /dev/null +++ b/windows/vs13/tests.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/windows/vs13/tifconf.mak b/windows/vs13/tifconf.mak new file mode 100644 index 000000000..f5d13a542 --- /dev/null +++ b/windows/vs13/tifconf.mak @@ -0,0 +1,10 @@ +PATH=..\..\libraries\tiff\libtiff + +all: $(PATH)\tif_config.h $(PATH)\tiffconf.h + +$(PATH)\tif_config.h: $(PATH)\tif_config.h.vc + copy $(PATH)\tif_config.h.vc $(PATH)\tif_config.h + +$(PATH)\tiffconf.h: $(PATH)\tiffconf.h.vc + copy $(PATH)\tiffconf.h.vc $(PATH)\tiffconf.h + diff --git a/windows/vs13/tiff.vcxproj b/windows/vs13/tiff.vcxproj new file mode 100644 index 000000000..cc40f8bc7 --- /dev/null +++ b/windows/vs13/tiff.vcxproj @@ -0,0 +1,372 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {186BAEF6-CF24-42C1-8CE3-25590CB9F6E7} + tiff + + + + StaticLibrary + false + MultiByte + true + v120 + + + StaticLibrary + false + MultiByte + v120 + + + StaticLibrary + false + MultiByte + true + v120 + + + StaticLibrary + false + MultiByte + v120 + + + StaticLibrary + false + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + tiff32d + tiff32 + tiff32-sse2 + tiff64d + tiff64 + + + + nmake tifconf.mak + + + MaxSpeed + OnlyExplicitInline + ..\..\libraries\jpeg;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;USE_WIN32_FILEIO;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + NotSet + + + + + true + $(IntDir) + Level2 + ProgramDatabase + Default + + + 4133;4005 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + nmake tifconf.mak + + + X64 + + + MaxSpeed + OnlyExplicitInline + ..\..\libraries\jpeg;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;USE_WIN32_FILEIO;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + + + + + true + $(IntDir) + Level2 + ProgramDatabase + Default + 4133;4005 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + nmake tifconf.mak + + + Disabled + OnlyExplicitInline + ..\..\libraries\jpeg;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;USE_WIN32_FILEIO;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + + + + + true + $(IntDir) + Level2 + ProgramDatabase + Default + + + 4133;4005 + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + nmake tifconf.mak + + + X64 + + + Disabled + OnlyExplicitInline + ..\..\libraries\jpeg;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_LIB;USE_WIN32_FILEIO;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + Default + MultiThreadedDebug + false + + + + + true + $(IntDir) + Level2 + ProgramDatabase + Default + 4133;4005 + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + nmake tifconf.mak + + + MaxSpeed + OnlyExplicitInline + ..\..\libraries\jpeg;..\..\libraries\zlib;%(AdditionalIncludeDirectories) + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_LIB;USE_WIN32_FILEIO;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + StreamingSIMDExtensions2 + + + + + true + $(IntDir) + Level2 + ProgramDatabase + Default + + + 4133;4005 + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/tiff.vcxproj.filters b/windows/vs13/tiff.vcxproj.filters new file mode 100644 index 000000000..606c75217 --- /dev/null +++ b/windows/vs13/tiff.vcxproj.filters @@ -0,0 +1,151 @@ + + + + + {d0b9355c-1ce8-48f3-afbd-6955ac61ed99} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {a7d774f9-ac09-460c-bb5d-3304c7cfa805} + h;hpp;hxx;hm;inl + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/windows/vs13/vfewin.vcxproj b/windows/vs13/vfewin.vcxproj new file mode 100644 index 000000000..61fd4b043 --- /dev/null +++ b/windows/vs13/vfewin.vcxproj @@ -0,0 +1,393 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {72793DF1-D4AF-4AA0-A606-7B51ED2A3F5C} + vfewin + Win32Proj + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + vfe32d + vfe32 + vfe32-sse2 + vfe64d + vfe64 + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(Configuration)/povray.tlb + + + + + /FD %(AdditionalOptions) + Disabled + true + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;WINVER=0x0500;_WIN32_WINNT=0x0500;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + true + true + Use + vfeprecomp.h + $(IntDir)vfeprecomp.pch + $(IntDir)$(ProjectName).pdb + true + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + vfeprecomp.h;%(ForcedIncludeFiles) + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(Configuration)/povray.tlb + + + + + /FD %(AdditionalOptions) + Disabled + true + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;_DEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_HAS_ITERATOR_DEBUGGING=0;_HAS_CPP0X=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions) + true + true + Sync + Default + MultiThreadedDebug + false + NotSet + true + true + Use + vfeprecomp.h + $(IntDir)vfeprecomp.pch + $(IntDir)$(ProjectName).pdb + true + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + vfeprecomp.h;%(ForcedIncludeFiles) + false + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(Configuration)/povray.tlb + + + + + Full + AnySuitable + true + Speed + true + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + false + false + NotSet + true + true + Use + vfeprecomp.h + $(IntDir)vfeprecomp.pch + $(IntDir)$(ProjectName).pdb + true + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + vfeprecomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + $(Configuration)/povray.tlb + + + + + Full + AnySuitable + true + Speed + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;CLASSLIB_DEFS_H;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0;BUILDING_AMD64=1;COMMONCTRL_VERSION=0x500;_WIN32_WINNT=0x0500;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + false + false + NotSet + true + true + Use + vfeprecomp.h + $(IntDir)vfeprecomp.pch + $(IntDir)$(ProjectName).pdb + true + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + vfeprecomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + $(Configuration)/povray.tlb + + + + + Full + AnySuitable + true + Speed + true + ..\..\windows\povconfig;..\..\libraries\boost;..\..\vfe\win\;..\..\vfe;..\..\source;..\..\source\base;..\..\source\backend;..\..\source\frontend;..\..\libraries\jpeg;..\..\libraries\zlib;..\..\libraries\png;..\..\libraries\tiff\libtiff;%(AdditionalIncludeDirectories) + BOOST_ALL_NO_LIB;NDEBUG;WIN32;WIN32_LEAN_AND_MEAN;_WINDOWS;COMMONCTRL_VERSION=0x500;CLASSLIB_DEFS_H;WINVER=0x0500;_WIN32_WINNT=0x0500;NOMINMAX;ISOLATION_AWARE_ENABLED;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_SECURE_SCL=0;_HAS_CPP0X=0;%(PreprocessorDefinitions) + true + true + Sync + MultiThreaded + false + false + StreamingSIMDExtensions2 + true + true + Use + vfeprecomp.h + $(IntDir)vfeprecomp.pch + $(IntDir)$(ProjectName).pdb + true + Level3 + true + ProgramDatabase + Default + 4800;%(DisableSpecificWarnings) + vfeprecomp.h;%(ForcedIncludeFiles) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/vfewin.vcxproj.filters b/windows/vs13/vfewin.vcxproj.filters new file mode 100644 index 000000000..0272219dd --- /dev/null +++ b/windows/vs13/vfewin.vcxproj.filters @@ -0,0 +1,69 @@ + + + + + {ae78b571-886b-451a-902b-86c135070723} + + + {be21a8d0-429f-4f34-9146-6c6ffbd2e7ff} + + + {98d92497-1571-433a-a70c-855cc1e912c1} + *.h + + + {672e98ad-14eb-41f9-a038-c63dbcae6770} + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source\win + + + Source\win + + + Source\win + + + + + + Headers + + + Headers + + + Headers + + + Headers + + + Headers\win + + + Headers\win + + + Headers\win + + + + \ No newline at end of file diff --git a/windows/vs13/zlib.vcxproj b/windows/vs13/zlib.vcxproj new file mode 100644 index 000000000..83eec677d --- /dev/null +++ b/windows/vs13/zlib.vcxproj @@ -0,0 +1,301 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release-SSE2 + Win32 + + + Release + Win32 + + + Release + x64 + + + + {8BB067C4-7135-4643-863C-49C520BEEA01} + zlib + + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + true + v120 + + + StaticLibrary + false + v120 + + + StaticLibrary + false + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin64\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + bin32\lib\ + build\$(ProjectName)\$(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + zlib32d + zlib32 + zlib32-sse2 + zlib64d + zlib64 + + + + MaxSpeed + OnlyExplicitInline + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + NotSet + + + + + true + $(IntDir) + Level2 + true + + + + + 0x0409 + + + true + + + + + + + + + X64 + + + MaxSpeed + OnlyExplicitInline + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + + + + + true + $(IntDir) + Level2 + true + + + + + 0x0409 + + + true + + + + + + + + + Disabled + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + Sync + Default + MultiThreadedDebug + false + StreamingSIMDExtensions2 + + + + + true + $(IntDir) + Level2 + true + ProgramDatabase + + + + + 0x0409 + + + true + + + + + + + + + X64 + + + Disabled + WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + Sync + Default + MultiThreadedDebug + false + + + + + true + $(IntDir) + Level2 + true + ProgramDatabase + + + + + 0x0409 + + + true + + + + + + + + + MaxSpeed + OnlyExplicitInline + WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + Sync + MultiThreaded + false + false + StreamingSIMDExtensions2 + + + + + true + $(IntDir) + Level2 + true + + + + + 0x0409 + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs13/zlib.vcxproj.filters b/windows/vs13/zlib.vcxproj.filters new file mode 100644 index 000000000..dda9d9307 --- /dev/null +++ b/windows/vs13/zlib.vcxproj.filters @@ -0,0 +1,56 @@ + + + + + {17f1b752-5736-4a40-ba6d-adc2140ed7f3} + *.c + + + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + Source + + + \ No newline at end of file