diff --git a/.gitmodules b/.gitmodules index 1749696..3167aa9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "ext/glm"] path = ext/glm url = https://github.com/g-truc/glm.git -[submodule "ext/pthreads4w-code"] - path = ext/pthreads4w-code - url = https://git.code.sf.net/p/pthreads4w/code diff --git a/LivePlotter.vcxproj b/LivePlotter.vcxproj index a2131d0..e784240 100644 --- a/LivePlotter.vcxproj +++ b/LivePlotter.vcxproj @@ -97,15 +97,15 @@ - $(SolutionDir)lib;$(SolutionDir)ext\pthreads4w-code\build\Debug;$(SolutionDir)ext\glfw\build\src\Debug;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) - $(SolutionDir)ext\pthreads4w-code;$(SolutionDir)ext\glm;$(SolutionDir)ext\glfw\include;$(SolutionDir)inc;$(IncludePath) + $(SolutionDir)lib;$(SolutionDir)ext\glfw\build\src\Debug;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + $(SolutionDir)ext\glm;$(SolutionDir)ext\glfw\include;$(SolutionDir)inc;$(IncludePath) $(SolutionDir)bin\$(Platform)\$(Configuration)\ $(SolutionDir)obj\$(Platform)\$(Configuration)\ $(SolutionDir)src;$(SourcePath) - $(SolutionDir)lib;$(SolutionDir)ext\pthreads4w-code\build\Debug;$(SolutionDir)ext\glfw\build\src\Debug;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) - $(SolutionDir)ext\pthreads4w-code;$(SolutionDir)ext\glm;$(SolutionDir)ext\glfw\include;$(SolutionDir)inc;$(IncludePath) + $(SolutionDir)lib;$(SolutionDir)ext\glfw\build\src\Debug;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + $(SolutionDir)ext\glm;$(SolutionDir)ext\glfw\include;$(SolutionDir)inc;$(IncludePath) $(SolutionDir)bin\$(Platform)\$(Configuration)\ $(SolutionDir)obj\$(Platform)\$(Configuration)\ $(SolutionDir)src;$(SourcePath) @@ -161,10 +161,10 @@ Console true - ext\pthreads4w-code\build\Debug\pthreadVC3d.lib;glfw3.lib;opengl32.lib;%(AdditionalDependencies) + glfw3.lib;opengl32.lib;%(AdditionalDependencies) - xcopy /y "$(SolutionDir)poses.csv" "$(OutDir)" && xcopy /y "$(SolutionDir)ext\pthreads4w-code\build\Debug\pthreadVC3d.dll" "$(OutDir)" + xcopy /y "$(SolutionDir)poses.csv" "$(OutDir)" @@ -178,10 +178,10 @@ Console true - ext\pthreads4w-code\build\Debug\pthreadVC3d.lib;glfw3.lib;opengl32.lib;%(AdditionalDependencies) + glfw3.lib;opengl32.lib;%(AdditionalDependencies) - xcopy /y "$(SolutionDir)poses.csv" "$(OutDir)" && xcopy /y "$(SolutionDir)ext\pthreads4w-code\build\Debug\pthreadVC3d.dll" "$(OutDir)" + xcopy /y "$(SolutionDir)poses.csv" "$(OutDir)" @@ -213,10 +213,4 @@ - - - - - - - \ No newline at end of file + diff --git a/ext/pthreads4w-code b/ext/pthreads4w-code deleted file mode 160000 index 8e467a6..0000000 --- a/ext/pthreads4w-code +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8e467a62a14fd9de15af33beec0a913d23f4d2f9 diff --git a/src/live_plotter.cpp b/src/live_plotter.cpp index 9511973..5b9a0dc 100644 --- a/src/live_plotter.cpp +++ b/src/live_plotter.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include