diff --git a/.github/workflows/frequent_check.yml b/.github/workflows/frequent_check.yml
index b8263399a..37b6a7a2b 100644
--- a/.github/workflows/frequent_check.yml
+++ b/.github/workflows/frequent_check.yml
@@ -4,9 +4,14 @@ on: [push]
jobs:
- build-windows:
- name: Windows
- runs-on: [windows-latest]
+ build-cmake-windows:
+ strategy:
+ matrix:
+ os: [windows-latest]
+ platform: [x64]
+ configuration: [Release]
+ name: ${{ matrix.os }}-CMake
+ runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
@@ -16,23 +21,70 @@ jobs:
python-version: '3.7'
- name: configure
run: |
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=installWindows-Github -DPYTHON_VERSION="3.7" ..
+ mkdir out
+ cd out
+ cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DPYTHON_VERSION="3.7"
- name: make
run: |
- cd build
- cmake --build . --config Release -j
- cmake --build . --config Release --target install
+ cd out
+ cmake --build . --config ${{ matrix.configuration }} -j
+ cmake --build . --config ${{ matrix.configuration }} --target install
- name: test
run: |
- cd build
- ctest -C Release --output-on-failure
+ cd out
+ ctest -C ${{ matrix.configuration }} --output-on-failure
+ - name: Add msbuild to PATH
+ uses: microsoft/setup-msbuild@v1.1
+ with:
+ msbuild-architecture: x64
+ - name: msbuild
+ run: |
+ msbuild six.sln /p:configuration=${{ matrix.configuration }}
+
+ build-msbuild-windows:
+ strategy:
+ matrix:
+ os: [windows-latest]
+ platform: [x64]
+ configuration: [Debug] # Debug turns on more compiler warnings
+ name: ${{ matrix.os }}-msbuild
+ runs-on: ${{ matrix.os }}
+ steps:
+ - uses: actions/checkout@v2
+ - name: configure CODA-OSS
+ run: |
+ mkdir externals\coda-oss\out
+ cd externals\coda-oss\out
+ cmake .. -DCMAKE_INSTALL_PREFIX=install\${{ matrix.platform }}-${{ matrix.configuration }} -DENABLE_PYTHON=OFF
+ - name: make CODA-OSS
+ run: |
+ cd externals\coda-oss\out
+ cmake --build . --config ${{ matrix.configuration }} -j
+ cmake --build . --config ${{ matrix.configuration }} --target install
+ - name: Add msbuild to PATH
+ uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+ with:
+ msbuild-architecture: x64
+ - name: msbuild
+ run: |
+ msbuild six.sln /p:configuration=${{ matrix.configuration }}
+ #- name: vstest
+ # uses: microsoft/vstest-action@v1.0.0 # https://github.com/marketplace/actions/vstest-action
+ # with:
+ # platform: ${{ matrix.platform }}
+ # testAssembly: UnitTest.dll
+ # searchFolder: D:\a\nitro\nitro\x64\Debug
+ #- name: vstest
+ # run: |
+ # vstest.console D:\a\nitro\nitro\x64\Debug\UnitTest.dll
- build-linux:
- name: Linux
- runs-on: [ubuntu-latest]
+ build-linux-cmake:
+ strategy:
+ matrix:
+ os: [ubuntu-latest]
+ name: ${{ matrix.os }}-CMake
+ runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
@@ -42,15 +94,15 @@ jobs:
python-version: '3.7'
- name: configure
run: |
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=installLinux-Github -DPYTHON_VERSION=3.7 ..
+ mkdir target
+ cd target
+ cmake -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=3.7 ..
- name: make
run: |
- cd build
+ cd target
cmake --build . -j 8
cmake --build . --target install
- name: test
run: |
- cd build
+ cd target
ctest --output-on-failure
diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj
index eb1df6e06..a982b81e2 100644
--- a/UnitTest/UnitTest.vcxproj
+++ b/UnitTest/UnitTest.vcxproj
@@ -57,17 +57,21 @@
Use
Level3
true
- $(SolutionDir);$(SolutionDir)six\modules\c++\scene\include\;$(SolutionDir)six\modules\c++\six\include\;$(SolutionDir)six\modules\c++\six.sidd\include\;$(SolutionDir)six\modules\c++\six.sicd\include\;$(SolutionDir)six\modules\c++\cphd\include\;$(SolutionDir)six\modules\c++\cphd03\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
+ $(SolutionDir);$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration);$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration);$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
_DEBUG;SIX_DEFAULT_SCHEMA_PATH=R"($(SolutionDir)install-$(Configuration)-$(Platform).$(PlatformToolset)\conf\schema\six)";%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING
true
pch.h
true
AdvancedVectorExtensions2
- stdc11
+ true
+ MultiThreadedDebugDLL
+ true
+ true
+ true
Windows
- $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\lib\;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
+ $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
@@ -77,19 +81,21 @@
true
true
true
- $(SolutionDir);$(SolutionDir)six\modules\c++\scene\include\;$(SolutionDir)six\modules\c++\six\include\;$(SolutionDir)six\modules\c++\six.sidd\include\;$(SolutionDir)six\modules\c++\six.sicd\include\;$(SolutionDir)six\modules\c++\cphd\include\;$(SolutionDir)six\modules\c++\cphd03\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
+ $(SolutionDir);$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration);$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration);$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)
NDEBUG;%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING
true
pch.h
true
AdvancedVectorExtensions2
- stdc11
+ true
+ true
+ true
Windows
true
true
- $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\lib\;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
+ $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)
diff --git a/UnitTest/pch.h b/UnitTest/pch.h
index 6bfde49ce..2cb2d0379 100644
--- a/UnitTest/pch.h
+++ b/UnitTest/pch.h
@@ -86,6 +86,8 @@
#pragma comment(lib, "sys-c++")
#pragma comment(lib, "except-c++")
#pragma comment(lib, "str-c++")
+#pragma comment(lib, "xerces-c")
+#pragma comment(lib, "xml.lite-c++.lib")
#pragma warning(push)
#pragma warning(disable: 4800) // Implicit conversion from '...' to bool.Possible information loss
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index ba26b399f..8fa1207bd 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,10 +1,5 @@
# disable some unneeded coda-oss components
set(ENABLE_JARS OFF CACHE BOOL "" FORCE)
-set(ENABLE_JPEG OFF CACHE BOOL "" FORCE)
-set(ENABLE_PCRE OFF CACHE BOOL "" FORCE)
-set(ENABLE_UUID OFF CACHE BOOL "" FORCE)
-set(ENABLE_ZIP OFF CACHE BOOL "" FORCE)
-
add_subdirectory("${CODA_OSS_DIR}")
# six requires some static TREs from nitro, so we force enable them
diff --git a/externals/coda-oss/modules/c++/coda-oss.vcxproj b/externals/coda-oss/modules/c++/coda-oss.vcxproj
index cd7468965..6dc5c0fc6 100644
--- a/externals/coda-oss/modules/c++/coda-oss.vcxproj
+++ b/externals/coda-oss/modules/c++/coda-oss.vcxproj
@@ -594,6 +594,7 @@
AdvancedVectorExtensions2
MultiThreadedDebugDLL
true
+ MultiThreadedDebugDLL
diff --git a/externals/coda-oss/modules/c++/except/include/except/Throwable.h b/externals/coda-oss/modules/c++/except/include/except/Throwable.h
index 2a7deecbb..5067ab02a 100644
--- a/externals/coda-oss/modules/c++/except/include/except/Throwable.h
+++ b/externals/coda-oss/modules/c++/except/include/except/Throwable.h
@@ -166,8 +166,7 @@ class CODA_OSS_API Throwable
if (t.getSize() > 0)
s << ": " << t;
- std::string retval(s.str().c_str()); // truncate to first '\0'
- return retval;
+ return s.str();
}
const std::vector& getBacktrace() const noexcept
diff --git a/externals/nitro/UnitTest/pch.h b/externals/nitro/UnitTest/pch.h
index ab78e8ef4..2fa0542e0 100644
--- a/externals/nitro/UnitTest/pch.h
+++ b/externals/nitro/UnitTest/pch.h
@@ -1,45 +1,52 @@
-// pch.h: This is a precompiled header file.
-// Files listed below are compiled only once, improving build performance for future builds.
-// This also affects IntelliSense performance, including code completion and many code browsing features.
-// However, files listed here are ALL re-compiled if any one of them is updated between builds.
-// Do not add files here that you will be updating frequently as this negates the performance advantage.
-
-#ifndef PCH_H
-#define PCH_H
-
-// add headers that you want to pre-compile here
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define NOMINMAX
-#pragma warning(push)
-#pragma warning(disable: 5039) // '...': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
-#include
-#pragma warning(pop)
-#pragma comment(lib, "ws2_32")
-
-// We're building in Visual Studio ... used to control where we get a little bit of config info
-#define NITRO_PCH 1
-
-#include
-#include
-#include
-
-#include
-#pragma comment(lib, "io-c++")
-#pragma comment(lib, "io-c++")
-#pragma comment(lib, "except-c++")
-#pragma comment(lib, "sys-c++")
-#pragma comment(lib, "str-c++")
-#pragma comment(lib, "sio.lite-c++.lib")
-#pragma comment(lib, "math-c++")
-#pragma comment(lib, "mt-c++")
-
-#include
-#include
-#include
-#include
-#include
-
-#include "Test.h"
-
-#endif //PCH_H
+// pch.h: This is a precompiled header file.
+// Files listed below are compiled only once, improving build performance for future builds.
+// This also affects IntelliSense performance, including code completion and many code browsing features.
+// However, files listed here are ALL re-compiled if any one of them is updated between builds.
+// Do not add files here that you will be updating frequently as this negates the performance advantage.
+
+#ifndef PCH_H
+#define PCH_H
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#define NOMINMAX
+#pragma warning(push)
+#pragma warning(disable: 5039) // '...': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
+#include
+#pragma warning(pop)
+#pragma comment(lib, "ws2_32")
+
+#pragma warning(disable: 4820) // '...': '...' bytes padding added after data member '...'
+#pragma warning(disable: 4710) // '...': function not inlined
+#pragma warning(disable: 5045) // Compiler will insert Spectre mitigation for memory load if / Qspectre switch specified
+#pragma warning(disable: 4668) // '...' is not defined as a preprocessor macro, replacing with '...' for '...'
+// TODO: get rid of these someday?
+#pragma warning(disable: 5039) // '...': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception.
+#pragma warning(disable: 4514) // '...': unreferenced inline function has been removed
+
+// We're building in Visual Studio ... used to control where we get a little bit of config info
+#define NITRO_PCH 1
+
+#pragma warning(disable: 5032) // detected #pragma warning(push) with no corresponding #pragma warning(pop)
+#pragma warning(push)
+#pragma warning(disable: 4464) // relative include path contains '..'
+#include
+#pragma warning(disable: 5031) // #pragma warning(pop): likely mismatch, popping warning state pushed in different file
+#pragma comment(lib, "io-c++")
+#pragma comment(lib, "except-c++")
+#pragma comment(lib, "sys-c++")
+#pragma comment(lib, "str-c++")
+#pragma warning(pop)
+
+#pragma warning(push)
+#include "CppUnitTest.h"
+#pragma warning(pop)
+
+#include
+#include
+#include
+
+#include "nitf_Test.h"
+#include "Test.h"
+
+#endif //PCH_H
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp b/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp
index afdbd8f90..46b9bac5b 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/NITFException.hpp
@@ -46,7 +46,7 @@ namespace nitf
static std::string to_string(const char(&s)[sz])
{
// avoid array -> pointer decay; code-analysis diagnostic
- return std::string(s, sz);
+ return std::string(s);
}
public:
Error(const nitf_Error* error) noexcept : pError(error) { assert(pError != nullptr); }
diff --git a/six.sln b/six.sln
index 410e4458a..258b1a0eb 100644
--- a/six.sln
+++ b/six.sln
@@ -38,6 +38,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csm", "six\projects\csm\csm
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTest", "UnitTest\UnitTest.vcxproj", "{F6888896-E658-414C-90CD-1208FA31A22E}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "externals", "externals", "{F033066A-4172-4AC0-96AD-BF5090F713C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "coda-oss", "externals\coda-oss\modules\c++\coda-oss.vcxproj", "{9997E895-5161-4DDF-8F3F-099894CB2F21}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github-workflows", ".github-workflows", "{DB2B94ED-952C-4794-A692-E6B64AA9EE5A}"
+ ProjectSection(SolutionItems) = preProject
+ .github\workflows\codeql.yml = .github\workflows\codeql.yml
+ .github\workflows\frequent_check.yml = .github\workflows\frequent_check.yml
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -100,10 +110,21 @@ Global
{F6888896-E658-414C-90CD-1208FA31A22E}.Debug|x64.Build.0 = Debug|x64
{F6888896-E658-414C-90CD-1208FA31A22E}.Release|x64.ActiveCfg = Release|x64
{F6888896-E658-414C-90CD-1208FA31A22E}.Release|x64.Build.0 = Release|x64
+ {9997E895-5161-4DDF-8F3F-099894CB2F21}.Debug|x64.ActiveCfg = Debug|x64
+ {9997E895-5161-4DDF-8F3F-099894CB2F21}.Debug|x64.Build.0 = Debug|x64
+ {9997E895-5161-4DDF-8F3F-099894CB2F21}.Release|x64.ActiveCfg = Release|x64
+ {9997E895-5161-4DDF-8F3F-099894CB2F21}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {F06550AD-CFC7-40B8-8727-6C82C69A8982} = {F033066A-4172-4AC0-96AD-BF5090F713C2}
+ {8F357A19-799E-4971-850E-3F28485C130B} = {F033066A-4172-4AC0-96AD-BF5090F713C2}
+ {78849481-D356-4CC7-B182-31C21F857ED1} = {F033066A-4172-4AC0-96AD-BF5090F713C2}
+ {9997E895-5161-4DDF-8F3F-099894CB2F21} = {F033066A-4172-4AC0-96AD-BF5090F713C2}
+ {DB2B94ED-952C-4794-A692-E6B64AA9EE5A} = {3AD152C2-1F3D-4108-826C-79BA5011874F}
+ EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E20E9FC7-D138-4517-8597-79C1FAC3E28D}
EndGlobalSection
diff --git a/six/modules/c++/cphd/cphd.vcxproj b/six/modules/c++/cphd/cphd.vcxproj
index da53e0957..fc081ca05 100644
--- a/six/modules/c++/cphd/cphd.vcxproj
+++ b/six/modules/c++/cphd/cphd.vcxproj
@@ -55,7 +55,7 @@
Use
pch.h
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\scene\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\six.sicd\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\scene\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\six.sicd\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
true
/Zc:__cplusplus %(AdditionalOptions)
true
@@ -64,7 +64,8 @@
Guard
EnableAllWarnings
true
- stdc11
+ MultiThreadedDebugDLL
+ true
@@ -82,15 +83,15 @@
true
Use
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\scene\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\six.sicd\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\scene\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\six.sicd\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
Speed
true
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
- MultiThreadedDLL
- stdc11
pch.h
+ Guard
+ true
diff --git a/six/modules/c++/cphd03/cphd03.vcxproj b/six/modules/c++/cphd03/cphd03.vcxproj
index 1d81fced0..cbdb44a2b 100644
--- a/six/modules/c++/cphd03/cphd03.vcxproj
+++ b/six/modules/c++/cphd03/cphd03.vcxproj
@@ -55,7 +55,7 @@
Use
pch.h
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\cphd\include\;$(ProjectDir)..\six.sicd\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\cphd\include\;$(ProjectDir)..\six.sicd\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
true
/Zc:__cplusplus %(AdditionalOptions)
true
@@ -64,7 +64,8 @@
Guard
EnableAllWarnings
true
- stdc11
+ MultiThreadedDebugDLL
+ true
@@ -82,15 +83,15 @@
true
Use
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\cphd\include\;$(ProjectDir)..\six.sicd\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\cphd\include\;$(ProjectDir)..\six.sicd\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
Speed
true
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
- MultiThreadedDLL
- stdc11
pch.h
+ Guard
+ true
diff --git a/six/modules/c++/samples/check_valid_six.dir/check_valid_six.vcxproj b/six/modules/c++/samples/check_valid_six.dir/check_valid_six.vcxproj
index 2939a21cf..7ce7e498d 100644
--- a/six/modules/c++/samples/check_valid_six.dir/check_valid_six.vcxproj
+++ b/six/modules/c++/samples/check_valid_six.dir/check_valid_six.vcxproj
@@ -52,7 +52,7 @@
true
_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING
true
- $(SolutionDir)six\modules\c++\scene\include\;$(SolutionDir)six\modules\c++\six\include\;$(SolutionDir)six\modules\c++\six.sidd\include\;$(SolutionDir)six\modules\c++\six.sicd\include\;$(SolutionDir)six\modules\c++\cphd\include\;$(SolutionDir)six\modules\c++\cphd03\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\
+ $(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include
Use
pch.h
pch.h
@@ -60,16 +60,16 @@
true
AdvancedVectorExtensions2
ProgramDatabase
- MultiThreadedDebugDLL
Guard
EnableAllWarnings
true
- stdc11
+ MultiThreadedDebugDLL
+ true
Console
true
- $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\lib\;%(AdditionalLibraryDirectories)
+ $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib;%(AdditionalLibraryDirectories)
@@ -80,7 +80,7 @@
true
NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING
true
- $(SolutionDir)six\modules\c++\scene\include\;$(SolutionDir)six\modules\c++\six\include\;$(SolutionDir)six\modules\c++\six.sidd\include\;$(SolutionDir)six\modules\c++\six.sicd\include\;$(SolutionDir)six\modules\c++\cphd\include\;$(SolutionDir)six\modules\c++\cphd03\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\
+ $(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include
Use
pch.h
pch.h
@@ -88,15 +88,15 @@
true
AdvancedVectorExtensions2
Speed
- MultiThreadedDLL
- stdc11
+ Guard
+ true
Console
true
true
true
- $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\lib\;%(AdditionalLibraryDirectories)
+ $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib;%(AdditionalLibraryDirectories)
diff --git a/six/modules/c++/samples/check_valid_six.dir/pch.h b/six/modules/c++/samples/check_valid_six.dir/pch.h
index 29b804744..9aa7d8f4d 100644
--- a/six/modules/c++/samples/check_valid_six.dir/pch.h
+++ b/six/modules/c++/samples/check_valid_six.dir/pch.h
@@ -70,3 +70,5 @@
#include
#pragma comment(lib, "cli-c++")
+#pragma comment(lib, "xerces-c")
+#pragma comment(lib, "xml.lite-c++.lib")
\ No newline at end of file
diff --git a/six/modules/c++/samples/crop_sicd.dir/crop_sicd.vcxproj b/six/modules/c++/samples/crop_sicd.dir/crop_sicd.vcxproj
index 9ab5b1564..51253b9f6 100644
--- a/six/modules/c++/samples/crop_sicd.dir/crop_sicd.vcxproj
+++ b/six/modules/c++/samples/crop_sicd.dir/crop_sicd.vcxproj
@@ -52,7 +52,7 @@
true
_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING
true
- $(SolutionDir)six\modules\c++\scene\include\;$(SolutionDir)six\modules\c++\six\include\;$(SolutionDir)six\modules\c++\six.sidd\include\;$(SolutionDir)six\modules\c++\six.sicd\include\;$(SolutionDir)six\modules\c++\cphd\include\;$(SolutionDir)six\modules\c++\cphd03\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\
+ $(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include
Use
pch.h
pch.h
@@ -60,16 +60,16 @@
true
AdvancedVectorExtensions2
ProgramDatabase
- MultiThreadedDebugDLL
Guard
EnableAllWarnings
true
- stdc11
+ MultiThreadedDebugDLL
+ true
Console
true
- $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\lib\;%(AdditionalLibraryDirectories)
+ $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib;%(AdditionalLibraryDirectories)
@@ -80,7 +80,7 @@
true
NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING
true
- $(SolutionDir)six\modules\c++\scene\include\;$(SolutionDir)six\modules\c++\six\include\;$(SolutionDir)six\modules\c++\six.sidd\include\;$(SolutionDir)six\modules\c++\six.sicd\include\;$(SolutionDir)six\modules\c++\cphd\include\;$(SolutionDir)six\modules\c++\cphd03\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\
+ $(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include
Use
pch.h
pch.h
@@ -88,15 +88,15 @@
true
AdvancedVectorExtensions2
Speed
- MultiThreadedDLL
- stdc11
+ Guard
+ true
Console
true
true
true
- $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\lib\;%(AdditionalLibraryDirectories)
+ $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib;%(AdditionalLibraryDirectories)
diff --git a/six/modules/c++/samples/crop_sicd.dir/pch.h b/six/modules/c++/samples/crop_sicd.dir/pch.h
index bdfe863c9..6d1b8d61d 100644
--- a/six/modules/c++/samples/crop_sicd.dir/pch.h
+++ b/six/modules/c++/samples/crop_sicd.dir/pch.h
@@ -70,3 +70,5 @@
#include
#pragma comment(lib, "cli-c++")
+#pragma comment(lib, "xerces-c")
+#pragma comment(lib, "xml.lite-c++.lib")
diff --git a/six/modules/c++/scene/scene.vcxproj b/six/modules/c++/scene/scene.vcxproj
index 0e8c488ea..52b473186 100644
--- a/six/modules/c++/scene/scene.vcxproj
+++ b/six/modules/c++/scene/scene.vcxproj
@@ -56,7 +56,7 @@
Use
pch.h
pch.h
- $(ProjectDir)include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(ProjectDir)..
+ $(ProjectDir)include\;$(ProjectDir)..;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
true
%(AdditionalOptions)
true
@@ -66,7 +66,8 @@
EnableAllWarnings
true
true
- stdc11
+ MultiThreadedDebugDLL
+ true
@@ -84,15 +85,15 @@
true
Use
pch.h
- $(ProjectDir)include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(ProjectDir)..
+ $(ProjectDir)include\;$(ProjectDir)..;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
Speed
true
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
- MultiThreadedDLL
- stdc11
pch.h
+ Guard
+ true
diff --git a/six/modules/c++/six.convert/six.convert.vcxproj b/six/modules/c++/six.convert/six.convert.vcxproj
index 32e627833..103c628b7 100644
--- a/six/modules/c++/six.convert/six.convert.vcxproj
+++ b/six/modules/c++/six.convert/six.convert.vcxproj
@@ -55,7 +55,7 @@
Use
pch.h
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\six.sicd\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\six.sicd\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
true
/Zc:__cplusplus %(AdditionalOptions)
true
@@ -63,7 +63,9 @@
ProgramDatabase
Guard
EnableAllWarnings
- stdc11
+ true
+ MultiThreadedDebugDLL
+ true
@@ -81,15 +83,15 @@
true
Use
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\six.sicd\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\six.sicd\include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
Speed
true
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
- MultiThreadedDLL
- stdc11
pch.h
+ Guard
+ true
diff --git a/six/modules/c++/six.sicd/six.sicd.vcxproj b/six/modules/c++/six.sicd/six.sicd.vcxproj
index dc3cb1fa5..7434cba31 100644
--- a/six/modules/c++/six.sicd/six.sicd.vcxproj
+++ b/six/modules/c++/six.sicd/six.sicd.vcxproj
@@ -56,7 +56,7 @@
Use
pch.h
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
true
%(AdditionalOptions)
true
@@ -64,7 +64,8 @@
ProgramDatabase
Guard
EnableAllWarnings
- stdc11
+ MultiThreadedDebugDLL
+ true
@@ -82,15 +83,15 @@
true
Use
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
Speed
true
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
- MultiThreadedDLL
- stdc11
pch.h
+ Guard
+ true
diff --git a/six/modules/c++/six.sidd/six.sidd.vcxproj b/six/modules/c++/six.sidd/six.sidd.vcxproj
index 4025b8cea..783cdee8e 100644
--- a/six/modules/c++/six.sidd/six.sidd.vcxproj
+++ b/six/modules/c++/six.sidd/six.sidd.vcxproj
@@ -56,7 +56,7 @@
Use
pch.h
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
true
%(AdditionalOptions)
true
@@ -64,7 +64,9 @@
ProgramDatabase
Guard
EnableAllWarnings
- stdc11
+ true
+ MultiThreadedDebugDLL
+ true
@@ -82,15 +84,15 @@
true
Use
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\six\include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
Speed
true
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
- MultiThreadedDLL
- stdc11
pch.h
+ Guard
+ true
diff --git a/six/modules/c++/six/six.vcxproj b/six/modules/c++/six/six.vcxproj
index 4c3c4a78f..807078a96 100644
--- a/six/modules/c++/six/six.vcxproj
+++ b/six/modules/c++/six/six.vcxproj
@@ -56,7 +56,7 @@
Use
pch.h
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
%(AdditionalOptions)
true
AdvancedVectorExtensions2
@@ -65,7 +65,9 @@
EnableAllWarnings
true
true
- stdc11
+ true
+ MultiThreadedDebugDLL
+ true
@@ -83,15 +85,15 @@
true
Use
pch.h
- $(ProjectDir)include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\
+ $(ProjectDir)include\;$(ProjectDir)..\scene\include\;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include\
Speed
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
- MultiThreadedDLL
true
- stdc11
pch.h
+ Guard
+ true
diff --git a/six/projects/csm/csm.vcxproj b/six/projects/csm/csm.vcxproj
index 53fb0d770..a7027cf0f 100644
--- a/six/projects/csm/csm.vcxproj
+++ b/six/projects/csm/csm.vcxproj
@@ -154,27 +154,26 @@
Use
pch.h
pch.h
- $(ProjectDir)include\;$(ProjectDir)external\vts_301_0\include\;$(ProjectDir)external\csm-3.0.4\;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\
+ $(ProjectDir)include;$(ProjectDir)external\vts_301_0\include;$(ProjectDir)external\csm-3.0.4;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include
true
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
ProgramDatabase
- MultiThreadedDebugDLL
Guard
- Level3
- stdc11
+ MultiThreadedDebugDLL
+ true
true
- $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\lib\
+ $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib
+ xerces-c.lib;xml.lite-c++.lib;%(AdditionalDependencies)
- Level3
true
true
true
@@ -182,15 +181,15 @@
true
Use
pch.h
- $(ProjectDir)include\;$(ProjectDir)external\vts_301_0\include\;$(ProjectDir)external\csm-3.0.4\;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)externals\nitro\modules\c\nrt\include\;$(SolutionDir)externals\nitro\modules\c\nitf\include\;$(SolutionDir)externals\nitro\modules\c++\nitf\include\;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\include\
+ $(ProjectDir)include;$(ProjectDir)external\vts_301_0\include;$(ProjectDir)external\csm-3.0.4;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include
Speed
true
/Zc:__cplusplus %(AdditionalOptions)
true
AdvancedVectorExtensions2
- MultiThreadedDLL
- stdc11
pch.h
+ Guard
+ true
@@ -198,7 +197,8 @@
true
true
true
- $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib\;$(SolutionDir)externals\coda-oss\install-$(Configuration)-$(Platform).$(PlatformToolset)\lib\
+ $(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\lib;$(SolutionDir)out\install\$(Platform)-$(Configuration)\lib
+ xerces-c.lib;xml.lite-c++.lib;%(AdditionalDependencies)