diff --git a/build/benchmarks/benchmark-styles.vcxproj b/build/benchmarks/benchmark-styles.vcxproj index 7e4f520e..551ee312 100644 --- a/build/benchmarks/benchmark-styles.vcxproj +++ b/build/benchmarks/benchmark-styles.vcxproj @@ -163,11 +163,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -179,13 +179,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/Debug/benchmark-styles.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/Debug/benchmark-styles.pdb Console @@ -206,11 +203,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -222,13 +219,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/Debug/benchmark-styles.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/Debug/benchmark-styles.pdb Console @@ -247,13 +241,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -265,13 +259,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/Release/benchmark-styles.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/Release/benchmark-styles.pdb Console @@ -290,13 +281,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -308,13 +299,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/Release/benchmark-styles.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/Release/benchmark-styles.pdb Console @@ -333,13 +321,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -351,13 +339,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/MinSizeRel/benchmark-styles.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/MinSizeRel/benchmark-styles.pdb Console @@ -376,13 +361,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -394,13 +379,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/MinSizeRel/benchmark-styles.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/MinSizeRel/benchmark-styles.pdb Console @@ -420,11 +402,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -436,13 +418,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/RelWithDebInfo/benchmark-styles.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/RelWithDebInfo/benchmark-styles.pdb Console @@ -462,11 +441,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -478,13 +457,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/RelWithDebInfo/benchmark-styles.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/RelWithDebInfo/benchmark-styles.pdb Console diff --git a/build/benchmarks/benchmark-writer.vcxproj b/build/benchmarks/benchmark-writer.vcxproj index ba7955db..8588ba27 100644 --- a/build/benchmarks/benchmark-writer.vcxproj +++ b/build/benchmarks/benchmark-writer.vcxproj @@ -163,11 +163,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -179,13 +179,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/Debug/benchmark-writer.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/Debug/benchmark-writer.pdb Console @@ -206,11 +203,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -222,13 +219,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/Debug/benchmark-writer.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/Debug/benchmark-writer.pdb Console @@ -247,13 +241,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -265,13 +259,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/Release/benchmark-writer.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/Release/benchmark-writer.pdb Console @@ -290,13 +281,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -308,13 +299,11 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 + %(AdditionalOptions) No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/Release/benchmark-writer.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/Release/benchmark-writer.pdb Console @@ -333,13 +322,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -351,13 +340,10 @@ %(Filename)_p.c - ..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/MinSizeRel/benchmark-writer.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/MinSizeRel/benchmark-writer.pdb Console @@ -376,13 +362,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -394,13 +380,10 @@ %(Filename)_p.c - ..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/MinSizeRel/benchmark-writer.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/MinSizeRel/benchmark-writer.pdb Console @@ -420,11 +403,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -436,13 +419,10 @@ %(Filename)_p.c - ..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/RelWithDebInfo/benchmark-writer.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/RelWithDebInfo/benchmark-writer.pdb Console @@ -462,11 +442,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR=D:/WORK/thirdparty/xlnt/benchmarks/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -478,13 +458,11 @@ %(Filename)_p.c - ..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/benchmarks/RelWithDebInfo/benchmark-writer.lib - D:/WORK/thirdparty/xlnt/build/benchmarks/RelWithDebInfo/benchmark-writer.pdb + $(SolutionDir)../build/benchmarks/RelWithDebInfo/benchmark-writer.pdb Console diff --git a/build/samples/sample-decrypt.vcxproj b/build/samples/sample-decrypt.vcxproj index 46ab3d0e..f2b215fa 100644 --- a/build/samples/sample-decrypt.vcxproj +++ b/build/samples/sample-decrypt.vcxproj @@ -163,11 +163,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -179,13 +179,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-decrypt.lib - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-decrypt.pdb Console @@ -206,11 +203,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -222,13 +219,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-decrypt.lib - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-decrypt.pdb Console @@ -247,13 +241,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -265,13 +259,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-decrypt.lib - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-decrypt.pdb Console @@ -290,13 +281,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -308,13 +299,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-decrypt.lib - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-decrypt.pdb Console @@ -333,13 +321,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -351,13 +339,10 @@ %(Filename)_p.c - ..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-decrypt.lib - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-decrypt.pdb Console @@ -376,13 +361,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -394,13 +379,10 @@ %(Filename)_p.c - ..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-decrypt.lib - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-decrypt.pdb Console @@ -420,11 +402,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -436,13 +418,10 @@ %(Filename)_p.c - ..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-decrypt.lib - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-decrypt.pdb Console @@ -462,11 +441,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -478,13 +457,10 @@ %(Filename)_p.c - ..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-decrypt.lib - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-decrypt.pdb Console diff --git a/build/samples/sample-img2xlsx.vcxproj b/build/samples/sample-img2xlsx.vcxproj index 7604b66a..9c1bf58e 100644 --- a/build/samples/sample-img2xlsx.vcxproj +++ b/build/samples/sample-img2xlsx.vcxproj @@ -163,11 +163,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -179,13 +179,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-img2xlsx.lib - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-img2xlsx.pdb Console @@ -206,11 +203,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -222,13 +219,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-img2xlsx.lib - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-img2xlsx.pdb Console @@ -247,13 +241,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -265,13 +259,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-img2xlsx.lib - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-img2xlsx.pdb Console @@ -290,13 +281,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -308,13 +299,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-img2xlsx.lib - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-img2xlsx.pdb Console @@ -333,13 +321,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -351,13 +339,10 @@ %(Filename)_p.c - ..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-img2xlsx.lib - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-img2xlsx.pdb Console @@ -376,13 +361,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -394,13 +379,10 @@ %(Filename)_p.c - ..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-img2xlsx.lib - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-img2xlsx.pdb Console @@ -420,11 +402,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -436,13 +418,10 @@ %(Filename)_p.c - ..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-img2xlsx.lib - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-img2xlsx.pdb Console @@ -462,11 +441,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -478,13 +457,10 @@ %(Filename)_p.c - ..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-img2xlsx.lib - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-img2xlsx.pdb Console diff --git a/build/samples/sample-sample.vcxproj b/build/samples/sample-sample.vcxproj index a7df267a..98024ddd 100644 --- a/build/samples/sample-sample.vcxproj +++ b/build/samples/sample-sample.vcxproj @@ -163,11 +163,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -181,11 +181,8 @@ $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-sample.lib - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-sample.pdb Console @@ -206,11 +203,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -224,11 +221,8 @@ $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-sample.lib - D:/WORK/thirdparty/xlnt/build/samples/Debug/sample-sample.pdb Console @@ -247,13 +241,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -267,11 +261,8 @@ $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-sample.lib - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-sample.pdb Console @@ -290,13 +281,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -310,11 +301,8 @@ $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-sample.lib - D:/WORK/thirdparty/xlnt/build/samples/Release/sample-sample.pdb Console @@ -333,13 +321,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -351,13 +339,10 @@ %(Filename)_p.c - $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-sample.lib - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-sample.pdb Console @@ -376,13 +361,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -394,13 +379,10 @@ %(Filename)_p.c - $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-sample.lib - D:/WORK/thirdparty/xlnt/build/samples/MinSizeRel/sample-sample.pdb Console @@ -420,11 +402,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -436,13 +418,10 @@ %(Filename)_p.c - $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-sample.lib - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-sample.pdb Console @@ -462,11 +441,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR=D:/WORK/thirdparty/xlnt/samples/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_SAMPLE_DATA_DIR="$(SolutionDir)..\samples\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\include;%(AdditionalIncludeDirectories) @@ -478,13 +457,10 @@ %(Filename)_p.c - $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-sample.lib - D:/WORK/thirdparty/xlnt/build/samples/RelWithDebInfo/sample-sample.pdb Console diff --git a/build/tests/xlnt.test.vcxproj b/build/tests/xlnt.test.vcxproj index 30b40350..19569562 100644 --- a/build/tests/xlnt.test.vcxproj +++ b/build/tests/xlnt.test.vcxproj @@ -165,11 +165,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + WIN32;_WINDOWS;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\tests\..\source;$(SolutionDir)..\tests\..\third-party\libstudxml;$(SolutionDir)..\source\..\include;%(AdditionalIncludeDirectories) @@ -181,13 +181,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/tests/Debug/xlnt.test.lib - D:/WORK/thirdparty/xlnt/build/tests/Debug/xlnt.test.pdb Console @@ -210,11 +207,11 @@ MultiThreadedDebugDLL true Level3 - WIN32;_WINDOWS;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) + XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";WIN32;_WINDOWS;XLNT_STATIC=1;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) - WIN32;_DEBUG;_WINDOWS;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\tests\..\source;$(SolutionDir)..\tests\..\third-party\libstudxml;$(SolutionDir)..\source\..\include;%(AdditionalIncludeDirectories) @@ -226,13 +223,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/tests/Debug/xlnt.test.lib - D:/WORK/thirdparty/xlnt/build/tests/Debug/xlnt.test.pdb Console @@ -253,13 +247,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\tests\..\source;$(SolutionDir)..\tests\..\third-party\libstudxml;$(SolutionDir)..\source\..\include;%(AdditionalIncludeDirectories) @@ -271,13 +265,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/tests/Release/xlnt.test.lib - D:/WORK/thirdparty/xlnt/build/tests/Release/xlnt.test.pdb Console @@ -298,13 +289,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\tests\..\source;$(SolutionDir)..\tests\..\third-party\libstudxml;$(SolutionDir)..\source\..\include;%(AdditionalIncludeDirectories) @@ -316,13 +307,10 @@ %(Filename)_p.c - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/tests/Release/xlnt.test.lib - D:/WORK/thirdparty/xlnt/build/tests/Release/xlnt.test.pdb Console @@ -343,13 +331,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\tests\..\source;$(SolutionDir)..\tests\..\third-party\libstudxml;$(SolutionDir)..\source\..\include;%(AdditionalIncludeDirectories) @@ -361,13 +349,10 @@ %(Filename)_p.c - ..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/tests/MinSizeRel/xlnt.test.lib - D:/WORK/thirdparty/xlnt/build/tests/MinSizeRel/xlnt.test.pdb Console @@ -388,13 +373,13 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\tests\..\source;$(SolutionDir)..\tests\..\third-party\libstudxml;$(SolutionDir)..\source\..\include;%(AdditionalIncludeDirectories) @@ -406,13 +391,10 @@ %(Filename)_p.c - ..\source\MinSizeRel\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 No %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/tests/MinSizeRel/xlnt.test.lib - D:/WORK/thirdparty/xlnt/build/tests/MinSizeRel/xlnt.test.pdb Console @@ -434,11 +416,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\tests\..\source;$(SolutionDir)..\tests\..\third-party\libstudxml;$(SolutionDir)..\source\..\include;%(AdditionalIncludeDirectories) @@ -450,13 +432,10 @@ %(Filename)_p.c - ..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/tests/RelWithDebInfo/xlnt.test.lib - D:/WORK/thirdparty/xlnt/build/tests/RelWithDebInfo/xlnt.test.pdb Console @@ -478,11 +457,11 @@ MultiThreadedDLL true Level3 - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) - WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR=D:/WORK/thirdparty/xlnt/tests/data;XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;XLNT_TEST_DATA_DIR="$(SolutionDir)..\tests\data";XLNT_BENCHMARK_DATA_DIR="$(SolutionDir)..\benchmarks\data";XLNT_STATIC=1;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) $(SolutionDir)..\tests;$(SolutionDir)..\tests\..\source;$(SolutionDir)..\tests\..\third-party\libstudxml;$(SolutionDir)..\source\..\include;%(AdditionalIncludeDirectories) @@ -494,13 +473,10 @@ %(Filename)_p.c - ..\source\RelWithDebInfo\xlnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib + $(SolutionDir)bin\$(Configuration)\$(Platform)\libstudxml.lib;$(SolutionDir)bin\$(Configuration)\$(Platform)\xLnt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;comdlg32.lib;advapi32.lib %(AdditionalLibraryDirectories) - %(AdditionalOptions) /machine:x64 Debug %(IgnoreSpecificDefaultLibraries) - D:/WORK/thirdparty/xlnt/build/tests/RelWithDebInfo/xlnt.test.lib - D:/WORK/thirdparty/xlnt/build/tests/RelWithDebInfo/xlnt.test.pdb Console diff --git a/build/tests/xlnt.test.vcxproj.filters b/build/tests/xlnt.test.vcxproj.filters index 6c7fa3fa..868f21a7 100644 --- a/build/tests/xlnt.test.vcxproj.filters +++ b/build/tests/xlnt.test.vcxproj.filters @@ -1,83 +1,33 @@  - - runner - + - - tests\cell - - - tests\cell - - - tests\cell - - - tests\styles - - - tests\styles - - - tests\styles - - - tests\styles - - - tests\utils - - - tests\utils - - - tests\utils - - - tests\utils - - - tests\workbook - - - tests\workbook - - - tests\workbook - - - tests\worksheet - - - tests\worksheet - - - tests\worksheet - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - - - helpers - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/xlnt_all.sln b/build/xlnt_all.sln index a9ef2624..4c746a59 100644 --- a/build/xlnt_all.sln +++ b/build/xlnt_all.sln @@ -90,13 +90,16 @@ Global {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.Debug|x86.Build.0 = Debug|Win32 {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 - {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.MinSizeRel|x86.ActiveCfg = MinSizeRel|x64 + {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.MinSizeRel|x86.ActiveCfg = MinSizeRel|Win32 + {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.MinSizeRel|x86.Build.0 = MinSizeRel|Win32 {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.Release|x64.ActiveCfg = Release|x64 {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.Release|x64.Build.0 = Release|x64 - {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.Release|x86.ActiveCfg = Release|x64 + {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.Release|x86.ActiveCfg = Release|Win32 + {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.Release|x86.Build.0 = Release|Win32 {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64 + {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 + {7750E9E5-9A8B-3A56-A3CB-84BFC2D358FB}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 {571FA43F-14DB-331F-8D8E-24742D1FFB1C}.Debug|x64.ActiveCfg = Debug|x64 {571FA43F-14DB-331F-8D8E-24742D1FFB1C}.Debug|x64.Build.0 = Debug|x64 {571FA43F-14DB-331F-8D8E-24742D1FFB1C}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/source/utils/path.cpp b/source/utils/path.cpp index 2d22888e..36437f00 100644 --- a/source/utils/path.cpp +++ b/source/utils/path.cpp @@ -23,6 +23,8 @@ #include #include +#include +#include #include #ifdef __APPLE__ @@ -137,8 +139,8 @@ path::path() } path::path(const std::string &path_string) - : internal_(path_string) { + std::remove_copy(path_string.begin(), path_string.end(), std::back_inserter(internal_), '\"'); } // general attributes diff --git a/tests/workbook/serialization_test_suite.hpp b/tests/workbook/serialization_test_suite.hpp index a6c5f7b2..3476a6ec 100644 --- a/tests/workbook/serialization_test_suite.hpp +++ b/tests/workbook/serialization_test_suite.hpp @@ -275,8 +275,10 @@ public: { #ifdef _MSC_VER xlnt::workbook wb; - const auto path = LSTRING_LITERAL(XLNT_TEST_DATA_DIR) L"/9_unicode_Λ.xlsx"; - wb.load(path); + std::wstring path = LSTRING_LITERAL(XLNT_TEST_DATA_DIR) L"/9_unicode_Λ.xlsx"; + std::wstring path_normalized; + std::remove_copy(path.begin(), path.end(), std::back_inserter(path_normalized), '\"'); + wb.load(path_normalized); xlnt_assert_equals(wb.active_sheet().cell("A1").value(), u8"unicodê!"); #endif