diff --git a/Externals/MagicFM.vcxproj b/Externals/MagicFM.vcxproj new file mode 100644 index 00000000000..67497031102 --- /dev/null +++ b/Externals/MagicFM.vcxproj @@ -0,0 +1,731 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + {848E8AB3-9962-4C04-B813-5690399C8A3E} + + + + StaticLibrary + v141 + false + MultiByte + true + + + StaticLibrary + v141 + false + MultiByte + true + + + StaticLibrary + v141 + false + MultiByte + + + StaticLibrary + v141 + false + MultiByte + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>12.0.30501.0 + + + + Disabled + $(xrExternals)FreeMagic\Source\;$(xrExternals)FreeMagic\Source\Approximation2D;$(xrExternals)FreeMagic\Source\Approximation3D;$(xrExternals)FreeMagic\Source\Containment2D;$(xrExternals)FreeMagic\Source\Containment3D;$(xrExternals)FreeMagic\Source\Core;$(xrExternals)FreeMagic\Source\Core2D;$(xrExternals)FreeMagic\Source\Core3D;$(xrExternals)FreeMagic\Source\Curve2D;$(xrExternals)FreeMagic\Source\Curve3D;$(xrExternals)FreeMagic\Source\Distance2D;$(xrExternals)FreeMagic\Source\Distance3D;$(xrExternals)FreeMagic\Source\ImageAnalysis;$(xrExternals)FreeMagic\Source\Interpolation1D;$(xrExternals)FreeMagic\Source\Interpolation2D;$(xrExternals)FreeMagic\Source\Interpolation3D;$(xrExternals)FreeMagic\Source\Intersection2D;$(xrExternals)FreeMagic\Source\Intersection3D;$(xrExternals)FreeMagic\Source\Numerics;$(xrExternals)FreeMagic\Source\Projection;$(xrExternals)FreeMagic\Source\Surface;$(xrExternals)FreeMagic\Source\Tessellation2D;$(xrExternals)FreeMagic\Source\Tessellation3D;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;STRICT;%(PreprocessorDefinitions) + EnableFastChecks + + Level3 + true + Default + + + true + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + Disabled + $(xrExternals)FreeMagic\Source\;$(xrExternals)FreeMagic\Source\Approximation2D;$(xrExternals)FreeMagic\Source\Approximation3D;$(xrExternals)FreeMagic\Source\Containment2D;$(xrExternals)FreeMagic\Source\Containment3D;$(xrExternals)FreeMagic\Source\Core;$(xrExternals)FreeMagic\Source\Core2D;$(xrExternals)FreeMagic\Source\Core3D;$(xrExternals)FreeMagic\Source\Curve2D;$(xrExternals)FreeMagic\Source\Curve3D;$(xrExternals)FreeMagic\Source\Distance2D;$(xrExternals)FreeMagic\Source\Distance3D;$(xrExternals)FreeMagic\Source\ImageAnalysis;$(xrExternals)FreeMagic\Source\Interpolation1D;$(xrExternals)FreeMagic\Source\Interpolation2D;$(xrExternals)FreeMagic\Source\Interpolation3D;$(xrExternals)FreeMagic\Source\Intersection2D;$(xrExternals)FreeMagic\Source\Intersection3D;$(xrExternals)FreeMagic\Source\Numerics;$(xrExternals)FreeMagic\Source\Projection;$(xrExternals)FreeMagic\Source\Surface;$(xrExternals)FreeMagic\Source\Tessellation2D;$(xrExternals)FreeMagic\Source\Tessellation3D;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;STRICT;%(PreprocessorDefinitions) + EnableFastChecks + + + Level3 + true + Default + + + true + + + + + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + AnySuitable + $(xrExternals)FreeMagic\Source\;$(xrExternals)FreeMagic\Source\Approximation2D;$(xrExternals)FreeMagic\Source\Approximation3D;$(xrExternals)FreeMagic\Source\Containment2D;$(xrExternals)FreeMagic\Source\Containment3D;$(xrExternals)FreeMagic\Source\Core;$(xrExternals)FreeMagic\Source\Core2D;$(xrExternals)FreeMagic\Source\Core3D;$(xrExternals)FreeMagic\Source\Curve2D;$(xrExternals)FreeMagic\Source\Curve3D;$(xrExternals)FreeMagic\Source\Distance2D;$(xrExternals)FreeMagic\Source\Distance3D;$(xrExternals)FreeMagic\Source\ImageAnalysis;$(xrExternals)FreeMagic\Source\Interpolation1D;$(xrExternals)FreeMagic\Source\Interpolation2D;$(xrExternals)FreeMagic\Source\Interpolation3D;$(xrExternals)FreeMagic\Source\Intersection2D;$(xrExternals)FreeMagic\Source\Intersection3D;$(xrExternals)FreeMagic\Source\Numerics;$(xrExternals)FreeMagic\Source\Projection;$(xrExternals)FreeMagic\Source\Surface;$(xrExternals)FreeMagic\Source\Tessellation2D;$(xrExternals)FreeMagic\Source\Tessellation3D;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;STRICT;%(PreprocessorDefinitions) + true + + Level3 + true + Default + false + true + StreamingSIMDExtensions2 + Fast + true + Speed + true + true + + + true + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + AnySuitable + $(xrExternals)FreeMagic\Source\;$(xrExternals)FreeMagic\Source\Approximation2D;$(xrExternals)FreeMagic\Source\Approximation3D;$(xrExternals)FreeMagic\Source\Containment2D;$(xrExternals)FreeMagic\Source\Containment3D;$(xrExternals)FreeMagic\Source\Core;$(xrExternals)FreeMagic\Source\Core2D;$(xrExternals)FreeMagic\Source\Core3D;$(xrExternals)FreeMagic\Source\Curve2D;$(xrExternals)FreeMagic\Source\Curve3D;$(xrExternals)FreeMagic\Source\Distance2D;$(xrExternals)FreeMagic\Source\Distance3D;$(xrExternals)FreeMagic\Source\ImageAnalysis;$(xrExternals)FreeMagic\Source\Interpolation1D;$(xrExternals)FreeMagic\Source\Interpolation2D;$(xrExternals)FreeMagic\Source\Interpolation3D;$(xrExternals)FreeMagic\Source\Intersection2D;$(xrExternals)FreeMagic\Source\Intersection3D;$(xrExternals)FreeMagic\Source\Numerics;$(xrExternals)FreeMagic\Source\Projection;$(xrExternals)FreeMagic\Source\Surface;$(xrExternals)FreeMagic\Source\Tessellation2D;$(xrExternals)FreeMagic\Source\Tessellation3D;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;STRICT;%(PreprocessorDefinitions) + true + + + Level3 + true + Default + false + true + StreamingSIMDExtensions2 + Fast + true + Speed + true + true + + + true + + + + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/MagicFM.vcxproj.filters b/Externals/MagicFM.vcxproj.filters new file mode 100644 index 00000000000..79c31facf4a --- /dev/null +++ b/Externals/MagicFM.vcxproj.filters @@ -0,0 +1,1857 @@ + + + + + {8f72b2b6-e17c-490b-aff7-85d17125f7ea} + + + {e826ec0e-0ea4-4c20-988a-9469d0b7e25f} + + + {8cdd3a7e-192d-4e9b-bb4d-6c30d797f7b4} + + + {c71bf957-9b01-46da-960e-e33b34d487f3} + + + {2e3cc388-15ad-477a-bd46-1769100e8cca} + + + {d8c1d742-2a67-4fce-a3d9-f2faffddfa3c} + + + {d28b7c50-2271-49cd-bacf-ec44dfa6c3c1} + + + {032c81b1-74c1-4e30-8bb7-c84490b3b6cd} + + + {e1d1bd45-f842-40ce-83c6-65ba849e0213} + + + {3caa1bd2-aaf5-4400-9217-6719683f98bf} + + + {dddc94b1-5efb-4909-a9ba-53573b2d7854} + + + {2687e4ce-4850-46f7-8432-902a2570d222} + + + {15f59ce8-ae32-4123-ac00-fa46dd4c4785} + + + {ce0b5aae-a1d6-4a39-a00e-3c5c2b3ab16f} + + + {56fbb03c-8bcb-432e-8cc9-6b496daecd7e} + + + {81c93606-faaa-43dc-beb8-dda048ebe0c5} + + + {61940f26-6945-464d-bfdc-88d724c4ba8d} + + + {81106280-1a35-4198-a1b7-513369f8cd26} + + + {0816c4b5-53bc-4044-a65f-6933941a46ab} + + + {c45434ff-f2fa-46de-ba55-4c9d1150a7b9} + + + {e64e060f-22cf-4802-b33d-743460fb9e67} + + + {deccee06-1bd4-43f4-bcc8-cabfae50e220} + + + {8215d4bf-cfb5-4146-89e4-3695b6495548} + + + {76bfe104-36d9-4ba5-977d-24a415503114} + + + {00f69945-8db8-4098-a55e-c3b3381e6582} + + + {6a366f4e-5b76-4f39-92e5-ee5d5dfdf10f} + + + {4a4cb5d1-bb28-48b8-a7cf-95d8984e2f60} + + + {77b8c2f4-a3da-4799-8675-e3356e84ad76} + + + {487df90e-baff-401b-b375-ee2f4fa59274} + + + {43d7c9ff-4658-420d-aa57-6fa6d1ca9bab} + + + {c85a6292-2516-4cc6-945f-6f34eefa2580} + + + {6b72ae60-0479-452b-893e-96f5293c48d5} + + + {2790e17e-a650-473e-94f3-82a043fd6d73} + + + {d1ba3a2c-44a0-46a6-9a0b-40a20accb493} + + + {9156c0f3-ac0b-4366-9d30-768e3ea2dd1d} + + + {611c9d72-b8b9-414c-95fe-5f59d790d7cb} + + + {47199dc7-8490-4af1-8557-af0597ca82cd} + + + {6b222b97-29f5-472f-b070-032f500e803b} + + + {3f2e5527-0bae-4ede-b22e-43bf8c8869fb} + + + {74b5714f-3919-4e28-bbbb-4f59c7d7a580} + + + {b6ab9475-ed2d-4a06-b8c4-da1212c66c90} + + + {bbb28652-9bc2-4b63-bf5d-3f9357379a5f} + + + {07dd4fcc-f7fa-4ebe-8925-8be53adcc4aa} + + + {acc452d3-6f83-4724-88e9-dab5687a5285} + + + {f59a3915-353b-4a93-8b74-1836f0c326f5} + + + {e89c6ef2-ead1-4a1c-8587-edaace921d4a} + + + {56342ccf-420e-4025-a300-dd1df0eaaf77} + + + {2ea6a605-7af6-4bc3-bf0f-34152a68cb78} + + + {db2c4454-22cc-46ca-af01-3fa0cc9e1b89} + + + {f6ab2fc7-414d-4f9d-b33f-0f44f27ca780} + + + {574f0571-2169-4b45-906e-ee4c3f97f6a6} + + + {c80bdbc6-9ee6-41bd-9352-94689c61209d} + + + {e0216a3d-585f-46e6-8f5f-d280b510b3f8} + + + {a5b76576-dae3-42ee-945a-83fc777decfa} + + + {a73933bc-143c-4076-8365-efb3bef5f47d} + + + {279d0b6b-0702-4248-a729-74fa60b461a9} + + + {b457655c-9cf8-4338-8375-87be5ab65e49} + + + {9bed1550-b316-47dc-83ce-f73b70da3bea} + + + {18cd9af0-9d70-44d9-876b-a9a66957f8dc} + + + {ee7618df-d01c-4622-9e4b-0a20c6f7a0fb} + + + {b5df4f1a-fa0d-4142-ad79-ebb6219354d9} + + + {f12e4452-e240-442c-9977-f99991734acc} + + + {e042c805-bb86-477b-a9b7-eea324a9cb7a} + + + {7ec062b7-daa6-4d0c-bfaa-bd15d673b224} + + + {b44320a3-d4dd-4de1-8e45-1efbee943ffb} + + + {5877d12d-1d4f-4dbb-b287-0386304c976c} + + + {6fbe0a8d-5e74-4247-a6bb-67dc94243f05} + + + {21c0289c-850c-4121-800b-2e8d0a13388f} + + + {d71c4d09-98c7-40f7-baf6-e38b765522a9} + + + {267c5f76-c5b2-49f5-bc62-f7b64eecf813} + + + {4bfadacf-f64b-4f15-a96b-6f4c1636b206} + + + {f5709ab5-f3e4-4cbd-9e74-7917fc29b940} + + + {8fbd787c-413b-4c31-ade2-ac2f4d6500c2} + + + {a1092c4f-c5d7-4523-aed0-a9910ece3e6a} + + + {afd84556-65c4-4ac8-8dab-485784c15a1f} + + + {2598342f-137f-4ce3-9ba8-7519257fcdf9} + + + {643647ca-7507-4a73-9f7f-2f05326caa38} + + + {80481229-2a47-4984-b086-0d82034f223f} + + + {06a18a63-9408-4618-96b7-188a20faa8cd} + + + {006db8f9-0cce-4e7e-ab36-0856ab93c3a7} + + + {089eb470-ec5a-4ef8-bfb2-c1e21fe400c9} + + + {03352002-dc81-4d3c-94ba-f7f525bf7385} + + + + + Approximation3D + + + Containment2D + + + Containment2D\Inline Files %28Containment2D%29 + + + Containment3D + + + Containment3D\Inline Files %28Containment3D%29 + + + Core + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core\Inline Files %28Core%29 + + + Core2D + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core2D\Inline Files %28Core2D%29 + + + Core3D + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Core3D\Inline Files %28Core3D%29 + + + Curve2D + + + Curve2D\Inline Files %28Curve2D%29 + + + Curve2D\Inline Files %28Curve2D%29 + + + Curve2D\Inline Files %28Curve2D%29 + + + Curve2D\Inline Files %28Curve2D%29 + + + Curve2D\Inline Files %28Curve2D%29 + + + Curve2D\Inline Files %28Curve2D%29 + + + Curve3D + + + Curve3D\Inline Files %28Curve3D%29 + + + Curve3D\Inline Files %28Curve3D%29 + + + Curve3D\Inline Files %28Curve3D%29 + + + Curve3D\Inline Files %28Curve3D%29 + + + Curve3D\Inline Files %28Curve3D%29 + + + Curve3D\Inline Files %28Curve3D%29 + + + Distance2D + + + Distance3D + + + ImageAnalysis + + + ImageAnalysis\Inline Files %28ImageAnalysis%29 + + + ImageAnalysis\Inline Files %28ImageAnalysis%29 + + + ImageAnalysis\Inline Files %28ImageAnalysis%29 + + + ImageAnalysis\Inline Files %28ImageAnalysis%29 + + + ImageAnalysis\Inline Files %28ImageAnalysis%29 + + + Interpolation1D + + + Interpolation1D\Inline Files %28Interpolation1D%29 + + + Interpolation1D\Inline Files %28Interpolation1D%29 + + + Interpolation1D\Inline Files %28Interpolation1D%29 + + + Interpolation1D\Inline Files %28Interpolation1D%29 + + + Interpolation1D\Inline Files %28Interpolation1D%29 + + + Interpolation2D + + + Interpolation2D\Inline Files %28Interpolation2D%29 + + + Interpolation2D\Inline Files %28Interpolation2D%29 + + + Interpolation2D\Inline Files %28Interpolation2D%29 + + + Interpolation3D + + + Interpolation3D\Inline Files %28Interpolation3D%29 + + + Interpolation3D\Inline Files %28Interpolation3D%29 + + + Interpolation3D\Inline Files %28Interpolation3D%29 + + + Intersection2D + + + Intersection3D + + + Numerics + + + Numerics\Inline Files %28Numerics%29 + + + Numerics\Inline Files %28Numerics%29 + + + Numerics\Inline Files %28Numerics%29 + + + Numerics\Inline Files %28Numerics%29 + + + Numerics\Inline Files %28Numerics%29 + + + Numerics\Inline Files %28Numerics%29 + + + Numerics\Inline Files %28Numerics%29 + + + Numerics\Inline Files %28Numerics%29 + + + Numerics\Inline Files %28Numerics%29 + + + Projection + + + Projection\Inline Files %28Projection%29 + + + Projection\Inline Files %28Projection%29 + + + Surface + + + Surface\Inline Files %28Surface%29 + + + Surface\Inline Files %28Surface%29 + + + Surface\Inline Files %28Surface%29 + + + Tessellation2D + + + Tessellation2D\Inline Files %28Tessellation2D%29 + + + Tessellation3D + + + Tessellation3D\Inline Files %28Tessellation3D%29 + + + + + + + Approximation2D\Source Files %28Approximation2D%29 + + + Approximation2D\Source Files %28Approximation2D%29 + + + Approximation2D\Source Files %28Approximation2D%29 + + + Approximation2D\Source Files %28Approximation2D%29 + + + Approximation2D\Source Files %28Approximation2D%29 + + + Approximation2D\Source Files %28Approximation2D%29 + + + Approximation3D\Source Files %28Approximation3D%29 + + + Approximation3D\Source Files %28Approximation3D%29 + + + Approximation3D\Source Files %28Approximation3D%29 + + + Approximation3D\Source Files %28Approximation3D%29 + + + Approximation3D\Source Files %28Approximation3D%29 + + + Approximation3D\Source Files %28Approximation3D%29 + + + Approximation3D\Source Files %28Approximation3D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment2D\Source Files %28Containment2D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Containment3D\Source Files %28Containment3D%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core\Source Files %28Core%29 + + + Core2D\Source Files %28Core2D%29 + + + Core2D\Source Files %28Core2D%29 + + + Core2D\Source Files %28Core2D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Core3D\Source Files %28Core3D%29 + + + Curve2D\Source Files %28Curve2D%29 + + + Curve2D\Source Files %28Curve2D%29 + + + Curve2D\Source Files %28Curve2D%29 + + + Curve2D\Source Files %28Curve2D%29 + + + Curve2D\Source Files %28Curve2D%29 + + + Curve2D\Source Files %28Curve2D%29 + + + Curve2D\Source Files %28Curve2D%29 + + + Curve2D\Source Files %28Curve2D%29 + + + Curve3D\Source Files %28Curve3D%29 + + + Curve3D\Source Files %28Curve3D%29 + + + Curve3D\Source Files %28Curve3D%29 + + + Curve3D\Source Files %28Curve3D%29 + + + Curve3D\Source Files %28Curve3D%29 + + + Curve3D\Source Files %28Curve3D%29 + + + Curve3D\Source Files %28Curve3D%29 + + + Curve3D\Source Files %28Curve3D%29 + + + Distance2D\Source Files %28Distance2D%29 + + + Distance2D\Source Files %28Distance2D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + Distance3D\Source Files %28Distance3D%29 + + + ImageAnalysis\Source Files %28ImageAnalysis%29 + + + ImageAnalysis\Source Files %28ImageAnalysis%29 + + + ImageAnalysis\Source Files %28ImageAnalysis%29 + + + ImageAnalysis\Source Files %28ImageAnalysis%29 + + + ImageAnalysis\Source Files %28ImageAnalysis%29 + + + ImageAnalysis\Source Files %28ImageAnalysis%29 + + + Interpolation1D\Source Files %28Interpolation1D%29 + + + Interpolation1D\Source Files %28Interpolation1D%29 + + + Interpolation1D\Source Files %28Interpolation1D%29 + + + Interpolation1D\Source Files %28Interpolation1D%29 + + + Interpolation1D\Source Files %28Interpolation1D%29 + + + Interpolation2D\Source Files %28Interpolation2D%29 + + + Interpolation2D\Source Files %28Interpolation2D%29 + + + Interpolation2D\Source Files %28Interpolation2D%29 + + + Interpolation2D\Source Files %28Interpolation2D%29 + + + Interpolation2D\Source Files %28Interpolation2D%29 + + + Interpolation2D\Source Files %28Interpolation2D%29 + + + Interpolation2D\Source Files %28Interpolation2D%29 + + + Interpolation2D\Source Files %28Interpolation2D%29 + + + Interpolation3D\Source Files %28Interpolation3D%29 + + + Interpolation3D\Source Files %28Interpolation3D%29 + + + Interpolation3D\Source Files %28Interpolation3D%29 + + + Interpolation3D\Source Files %28Interpolation3D%29 + + + Interpolation3D\Source Files %28Interpolation3D%29 + + + Interpolation3D\Source Files %28Interpolation3D%29 + + + Intersection2D\Source Files %28Intersection2D%29 + + + Intersection2D\Source Files %28Intersection2D%29 + + + Intersection2D\Source Files %28Intersection2D%29 + + + Intersection2D\Source Files %28Intersection2D%29 + + + Intersection2D\Source Files %28Intersection2D%29 + + + Intersection2D\Source Files %28Intersection2D%29 + + + Intersection2D\Source Files %28Intersection2D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Intersection3D\Source Files %28Intersection3D%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Numerics\Source Files %28Numerics%29 + + + Projection\Source Files %28Projection%29 + + + Projection\Source Files %28Projection%29 + + + Projection\Source Files %28Projection%29 + + + Projection\Source Files %28Projection%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Surface\Source Files %28Surface%29 + + + Tessellation2D\Source Files %28Tessellation2D%29 + + + Tessellation3D\Source Files %28Tessellation3D%29 + + + + + Approximation2D\Header Files %28Approximation2D%29 + + + Approximation2D\Header Files %28Approximation2D%29 + + + Approximation2D\Header Files %28Approximation2D%29 + + + Approximation2D\Header Files %28Approximation2D%29 + + + Approximation2D\Header Files %28Approximation2D%29 + + + Approximation2D\Header Files %28Approximation2D%29 + + + Approximation3D\Header Files %28Approximation3D%29 + + + Approximation3D\Header Files %28Approximation3D%29 + + + Approximation3D\Header Files %28Approximation3D%29 + + + Approximation3D\Header Files %28Approximation3D%29 + + + Approximation3D\Header Files %28Approximation3D%29 + + + Approximation3D\Header Files %28Approximation3D%29 + + + Approximation3D\Header Files %28Approximation3D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment2D\Header Files %28Containment2D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Containment3D\Header Files %28Containment3D%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core\Header Files %28Core%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core2D\Header Files %28Core2D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Core3D\Header Files %28Core3D%29 + + + Curve2D\Header Files %28Curve2D%29 + + + Curve2D\Header Files %28Curve2D%29 + + + Curve2D\Header Files %28Curve2D%29 + + + Curve2D\Header Files %28Curve2D%29 + + + Curve2D\Header Files %28Curve2D%29 + + + Curve2D\Header Files %28Curve2D%29 + + + Curve2D\Header Files %28Curve2D%29 + + + Curve2D\Header Files %28Curve2D%29 + + + Curve3D\Header Files %28Curve3D%29 + + + Curve3D\Header Files %28Curve3D%29 + + + Curve3D\Header Files %28Curve3D%29 + + + Curve3D\Header Files %28Curve3D%29 + + + Curve3D\Header Files %28Curve3D%29 + + + Curve3D\Header Files %28Curve3D%29 + + + Curve3D\Header Files %28Curve3D%29 + + + Curve3D\Header Files %28Curve3D%29 + + + Distance2D\Header Files %28Distance2D%29 + + + Distance2D\Header Files %28Distance2D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + Distance3D\Header Files %28Distance3D%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + ImageAnalysis\Header Files %28Image Analysis%29 + + + Interpolation1D\Header Files %28Interpolation1D%29 + + + Interpolation1D\Header Files %28Interpolation1D%29 + + + Interpolation1D\Header Files %28Interpolation1D%29 + + + Interpolation1D\Header Files %28Interpolation1D%29 + + + Interpolation1D\Header Files %28Interpolation1D%29 + + + Interpolation2D\Header Files %28Interpolation2D%29 + + + Interpolation2D\Header Files %28Interpolation2D%29 + + + Interpolation2D\Header Files %28Interpolation2D%29 + + + Interpolation2D\Header Files %28Interpolation2D%29 + + + Interpolation2D\Header Files %28Interpolation2D%29 + + + Interpolation2D\Header Files %28Interpolation2D%29 + + + Interpolation2D\Header Files %28Interpolation2D%29 + + + Interpolation2D\Header Files %28Interpolation2D%29 + + + Interpolation3D\Header Files %28Interpolation3D%29 + + + Interpolation3D\Header Files %28Interpolation3D%29 + + + Interpolation3D\Header Files %28Interpolation3D%29 + + + Interpolation3D\Header Files %28Interpolation3D%29 + + + Interpolation3D\Header Files %28Interpolation3D%29 + + + Interpolation3D\Header Files %28Interpolation3D%29 + + + Intersection2D\Header Files %28Intersection2D%29 + + + Intersection2D\Header Files %28Intersection2D%29 + + + Intersection2D\Header Files %28Intersection2D%29 + + + Intersection2D\Header Files %28Intersection2D%29 + + + Intersection2D\Header Files %28Intersection2D%29 + + + Intersection2D\Header Files %28Intersection2D%29 + + + Intersection2D\Header Files %28Intersection2D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Intersection3D\Header Files %28Intersection3D%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Numerics\Header Files %28Numerics%29 + + + Projection\Header Files %28Projection%29 + + + Projection\Header Files %28Projection%29 + + + Projection\Header Files %28Projection%29 + + + Projection\Header Files %28Projection%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Surface\Header Files %28Surface%29 + + + Tessellation2D\Header Files %28Tessellation2D%29 + + + Tessellation3D\Header Files %28Tessellation3D%29 + + + + + \ No newline at end of file diff --git a/Externals/cximage/cximage.vcxproj b/Externals/cximage/cximage.vcxproj index 3368d65a54f..b7243ca3dfa 100644 --- a/Externals/cximage/cximage.vcxproj +++ b/Externals/cximage/cximage.vcxproj @@ -337,8 +337,8 @@ {a0f7d1fb-59a7-4717-a7e4-96f37e91998e} - - {938c5808-85a1-4b5a-8cb4-d2d9d7851cb8} + + {3593c424-83cc-4445-be1a-97dde88fe386} diff --git a/Externals/libjpeg.vcxproj b/Externals/libjpeg.vcxproj new file mode 100644 index 00000000000..6af5d5464df --- /dev/null +++ b/Externals/libjpeg.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {3593C424-83CC-4445-BE1A-97DDE88FE386} + libjpeg + 10.0.14393.0 + + + + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + + + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + + + + + + + + + + + + + + Level3 + Disabled + true + + + + + Level3 + Disabled + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Externals/oalib.vcxproj b/Externals/oalib.vcxproj new file mode 100644 index 00000000000..65844ae9247 --- /dev/null +++ b/Externals/oalib.vcxproj @@ -0,0 +1,130 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {61D4856F-FA82-4F02-BB88-909DDFB1FE74} + oalib + Win32Proj + + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + StaticLibrary + v141 + Unicode + true + + + StaticLibrary + v141 + Unicode + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>14.0.25431.1 + + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + + + X64 + + + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + X64 + + + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/engine.sln b/src/engine.sln index 45de0ad43e5..5dc67b674c8 100644 --- a/src/engine.sln +++ b/src/engine.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27019.1 +VisualStudioVersion = 15.0.27102.0 MinimumVisualStudioVersion = 14.0.25420.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}" EndProject @@ -171,13 +171,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_static", "..\Exte EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile", "..\Externals\libvorbisfile_static.vcxproj", "{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\Externals\jpeg\libjpeg.vcxproj", "{938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BugTrap", "..\Externals\BugTrap.vcxproj", "{E8CF1ADA-264A-4127-86C2-FD7057D3792C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MagicFM", "..\Externals\FreeMagic\Source\MagicFM.vcxproj", "{848E8AB3-9962-4C04-B813-5690399C8A3E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MagicFM", "..\Externals\MagicFM.vcxproj", "{848E8AB3-9962-4C04-B813-5690399C8A3E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oalib", "..\Externals\OpenAutomate\oalib\oalib.vcxproj", "{61D4856F-FA82-4F02-BB88-909DDFB1FE74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oalib", "..\Externals\oalib.vcxproj", "{61D4856F-FA82-4F02-BB88-909DDFB1FE74}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\Externals\cryptlib.vcxproj", "{C39F4B46-6E89-4074-902E-CA57073044D2}" EndProject @@ -205,6 +203,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LuaJIT", "..\Externals\LuaJ {58AE014E-0DA3-4D9B-9034-21984C305447} = {58AE014E-0DA3-4D9B-9034-21984C305447} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\Externals\libjpeg.vcxproj", "{3593C424-83CC-4445-BE1A-97DDE88FE386}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_Dedicated|Win32 = Debug_Dedicated|Win32 @@ -1482,30 +1482,6 @@ Global {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|Win32.Build.0 = Release|Win32 {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|x64.ActiveCfg = Release|x64 {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|x64.Build.0 = Release|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Debug_Dedicated|Win32.Build.0 = Debug|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Debug_Dedicated|x64.ActiveCfg = Debug|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Debug_Dedicated|x64.Build.0 = Debug|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Debug|Win32.ActiveCfg = Debug|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Debug|Win32.Build.0 = Debug|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Debug|x64.ActiveCfg = Debug|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Debug|x64.Build.0 = Debug|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Mixed_Dedicated|Win32.Build.0 = Release|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Mixed_Dedicated|x64.ActiveCfg = Release|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Mixed_Dedicated|x64.Build.0 = Release|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Mixed|Win32.ActiveCfg = Release|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Mixed|Win32.Build.0 = Release|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Mixed|x64.ActiveCfg = Release|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Mixed|x64.Build.0 = Release|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Release_Dedicated|Win32.ActiveCfg = Release|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Release_Dedicated|Win32.Build.0 = Release|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Release_Dedicated|x64.ActiveCfg = Release|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Release_Dedicated|x64.Build.0 = Release|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Release|Win32.ActiveCfg = Release|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Release|Win32.Build.0 = Release|Win32 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Release|x64.ActiveCfg = Release|x64 - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8}.Release|x64.Build.0 = Release|x64 {E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32 {E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug_Dedicated|Win32.Build.0 = Debug|Win32 {E8CF1ADA-264A-4127-86C2-FD7057D3792C}.Debug_Dedicated|x64.ActiveCfg = Debug|x64 @@ -1762,6 +1738,30 @@ Global {632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|Win32.Build.0 = Release|Win32 {632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.ActiveCfg = Release|x64 {632AEEB6-DC06-4E15-9551-B2B09A4B73C5}.Release|x64.Build.0 = Release|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Debug_Dedicated|Win32.Build.0 = Debug|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Debug_Dedicated|x64.ActiveCfg = Debug|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Debug_Dedicated|x64.Build.0 = Debug|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Debug|Win32.ActiveCfg = Debug|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Debug|Win32.Build.0 = Debug|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Debug|x64.ActiveCfg = Debug|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Debug|x64.Build.0 = Debug|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Mixed_Dedicated|Win32.Build.0 = Release|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Mixed_Dedicated|x64.ActiveCfg = Release|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Mixed_Dedicated|x64.Build.0 = Release|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Mixed|Win32.ActiveCfg = Release|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Mixed|Win32.Build.0 = Release|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Mixed|x64.ActiveCfg = Release|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Mixed|x64.Build.0 = Release|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Release_Dedicated|Win32.ActiveCfg = Release|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Release_Dedicated|Win32.Build.0 = Release|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Release_Dedicated|x64.ActiveCfg = Release|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Release_Dedicated|x64.Build.0 = Release|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Release|Win32.ActiveCfg = Release|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Release|Win32.Build.0 = Release|Win32 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Release|x64.ActiveCfg = Release|x64 + {3593C424-83CC-4445-BE1A-97DDE88FE386}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1819,7 +1819,6 @@ Global {653F3841-3F26-49B9-AFCF-091DB4B67031} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} {3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} {CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} - {938C5808-85A1-4B5A-8CB4-D2D9D7851CB8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} {E8CF1ADA-264A-4127-86C2-FD7057D3792C} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} {848E8AB3-9962-4C04-B813-5690399C8A3E} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} {61D4856F-FA82-4F02-BB88-909DDFB1FE74} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} @@ -1831,6 +1830,7 @@ Global {58AE014E-0DA3-4D9B-9034-21984C305447} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250} {CDC5E78D-FF1C-4164-AE72-3578F60A27BA} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250} {632AEEB6-DC06-4E15-9551-B2B09A4B73C5} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250} + {3593C424-83CC-4445-BE1A-97DDE88FE386} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C5A32302-94F5-41B8-9606-017BB6BA69A6} diff --git a/src/xrCore/Debug/dxerr.cpp b/src/xrCore/Debug/dxerr.cpp index 14cdbfddcb9..63671714356 100644 --- a/src/xrCore/Debug/dxerr.cpp +++ b/src/xrCore/Debug/dxerr.cpp @@ -12,7 +12,7 @@ //-------------------------------------------------------------------------------------- #include "stdafx.h" #ifdef _MSC_VER -#pragma warning(disable: 4005) // macro redefinition of DXGI_ macros if mixinf DX SDK and new PSDK +#pragma warning(disable: 4005) // macro redefinition of DXGI_ macros if mixing DX SDK and new PSDK #endif #include "dxerr.h" diff --git a/src/xrCore/Debug/dxerr.h b/src/xrCore/Debug/dxerr.h index fdf17ba3e0b..abab3db7fa8 100644 --- a/src/xrCore/Debug/dxerr.h +++ b/src/xrCore/Debug/dxerr.h @@ -20,7 +20,6 @@ #define NOMINMAX #endif -#include #include #ifdef __cplusplus diff --git a/src/xrEngine/xrEngine.vcxproj b/src/xrEngine/xrEngine.vcxproj index 4afc5dd20e2..3fdcfb58fbd 100644 --- a/src/xrEngine/xrEngine.vcxproj +++ b/src/xrEngine/xrEngine.vcxproj @@ -1012,7 +1012,7 @@ {132c62de-de85-4978-9675-c78ed4da46f0} false - + {61d4856f-fa82-4f02-bb88-909ddfb1fe74}