From 953e4cc5b99efbb0a822def90899bac36fb60ca9 Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Sun, 26 Jul 2020 21:34:00 +0300 Subject: [PATCH 1/3] Don't require user to provide libglm --- .travis.yml | 4 +--- BUILDING.md | 6 ++---- configure.ac | 16 ++++++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2546720968..89acf77971 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ addons: packages: - libc++-dev - libsdl2-dev - - libglm-dev - libgl1-mesa-dev script: @@ -41,7 +40,6 @@ matrix: addons: apt: packages: - - libglm-dev - qt5-default - qtdeclarative5-dev - libqt5opengl5-dev @@ -57,7 +55,7 @@ matrix: - os: osx osx_image: xcode10 env: - - MATRIX_EVAL="brew update && brew install sdl2 glm" + - MATRIX_EVAL="brew update && brew install sdl2" notifications: email: diff --git a/BUILDING.md b/BUILDING.md index 9b02b866db..8de9b7a18e 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -7,8 +7,6 @@ Relevant for Linux distributions, FreeBSD, macOS: * `libtool`, or at least `pkg-config` * `which` -* `libglm-dev` - Main build options & their requirements: | Configure flag | Required dependency | Produced binary | @@ -18,7 +16,7 @@ Main build options & their requirements: | `--enable-jack` | `libjack2-dev`OR`libjack1-dev`; `qt5-default` `qtdeclarative5-dev` `libqt5opengl5`| `projectM-jack` | #### Additional information on dependencies -* `libglm` (headers only) for matrix math is required. +* `libglm` (headers only) for matrix math is required. lives in `vendor/glm`. * A modified version of `hlslparser` is included in Renderer and used to transpile HLSL shaders to GLSL * OpenGL 3+ or OpenGLES is required * `libsdl >= 2.0.5` is required for the SDL and emscripten apps. `src/projectM-sdl` is the current reference application implementation. maybe try getting that to build and run as your testbench. @@ -46,7 +44,7 @@ projectM supports OpenGL ES 3 for embedded systems. Be sure to configure with th ### Building on Windows Windows build bypasses the autogen/configure pipeline and uses the Visual Studio/MSVC files in `msvc/`. See `.appveyor.yml` for command line building. -Some dependencies are included verbatim (glew), while others leverage the NuGet ecosystem and are downloaded automatically (glm, sdl2). +Some dependencies are included verbatim (glew), while others leverage the NuGet ecosystem and are downloaded automatically (sdl2). ### Build using NDK for Android Install Android Studio, launch SDK Manager and install NDK diff --git a/configure.ac b/configure.ac index 42c51119f8..341d261032 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([projectM], [3.1.6], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/]) +AC_INIT([projectM], [3.1.7], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -103,12 +103,6 @@ AS_IF([test "$enable_sdl" != "no"], [ ]) -# glm -AS_IF([test "x$enable_emscripten" != "xyes"], [ - AC_CHECK_HEADER([glm/glm.hpp],, AC_MSG_ERROR(libglm is required.)) -]) - - # Threading AC_ARG_ENABLE([threading], AS_HELP_STRING([--enable-threading], [multhreading]), @@ -240,11 +234,17 @@ AM_CONDITIONAL([ENABLE_PRESET_SUBDIRS], [test "x$enable_preset_subdirs" = "xyes" my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits" #my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer " my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\"" -my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor" +my_CFLAGS="${my_CFLAGS} -I\"\$(top_srcdir)/vendor\"" # provides glm headers my_CFLAGS="${my_CFLAGS} -DGL_SILENCE_DEPRECATION" AC_SUBST([my_CFLAGS]) +# glm (vendored, this should never fail; headers are in vendor/glm) +AC_SUBST(CPPFLAGS, "$CPPFLAGS -I${srcdir}/vendor") +AS_IF([test "x$enable_emscripten" != "xyes"], [ + AC_CHECK_HEADER([glm/glm.hpp],, AC_MSG_ERROR(vendored libglm not found.)) +]) + AC_OUTPUT From eff67de91ab5648cdac55b0b0c39308221d307ec Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Sun, 26 Jul 2020 23:33:05 +0300 Subject: [PATCH 2/3] dist vendor --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 856ef93cd5..be8efb1acf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS=-I m4 AM_CPPFLAGS=-DDATADIR_PATH='"${pkgdatadir}"' SUBDIRS=src PRESETSDIR=presets -EXTRA_DIST=README.md AUTHORS.txt presets fonts $(PRESETSDIR) +EXTRA_DIST=README.md AUTHORS.txt presets fonts vendor $(PRESETSDIR) CLEANFILES=dist # stick apps in bin From 7260aa0247eb63543dbd1f48936aeabc09cefb8d Mon Sep 17 00:00:00 2001 From: "milkdropper.com" Date: Mon, 27 Jul 2020 23:37:31 +0400 Subject: [PATCH 3/3] Remove GLM requirement, add vendor headers. --- msvc/MilkdropPresetFactory.vcxproj | 13 ++----------- msvc/MstressJuppyDancer.vcxproj | 13 ++----------- msvc/NativePresetFactory.vcxproj | 13 ++----------- msvc/Renderer.vcxproj | 13 ++----------- msvc/RovastarDarkSecret.vcxproj | 13 ++----------- msvc/RovastarDriftingChaos.vcxproj | 13 ++----------- msvc/RovastarFractalSpiral.vcxproj | 13 ++----------- msvc/RovastarFractopiaFrantic.vcxproj | 13 ++----------- msvc/packages.config | 1 - msvc/projectM.vcxproj | 13 ++----------- msvc/projectMSDL.vcxproj | 6 ++---- 11 files changed, 20 insertions(+), 104 deletions(-) diff --git a/msvc/MilkdropPresetFactory.vcxproj b/msvc/MilkdropPresetFactory.vcxproj index f5c22d4e2b..378306addb 100644 --- a/msvc/MilkdropPresetFactory.vcxproj +++ b/msvc/MilkdropPresetFactory.vcxproj @@ -49,7 +49,7 @@ - $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -83,7 +83,7 @@ - $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -145,13 +145,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/MstressJuppyDancer.vcxproj b/msvc/MstressJuppyDancer.vcxproj index d688768449..ccf23f647d 100644 --- a/msvc/MstressJuppyDancer.vcxproj +++ b/msvc/MstressJuppyDancer.vcxproj @@ -53,7 +53,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -97,7 +97,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -175,13 +175,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/NativePresetFactory.vcxproj b/msvc/NativePresetFactory.vcxproj index 5854bfb796..80d8648e11 100644 --- a/msvc/NativePresetFactory.vcxproj +++ b/msvc/NativePresetFactory.vcxproj @@ -49,7 +49,7 @@ - $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -83,7 +83,7 @@ - $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -127,13 +127,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/Renderer.vcxproj b/msvc/Renderer.vcxproj index 361285ba35..ae283f843e 100644 --- a/msvc/Renderer.vcxproj +++ b/msvc/Renderer.vcxproj @@ -49,7 +49,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\SOIL2;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\SOIL2;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\hlslparser\src;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -83,7 +83,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\SOIL2;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\SOIL2;$(MSBuildThisFileDirectory)../src\libprojectM\Renderer\hlslparser\src;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -124,13 +124,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/RovastarDarkSecret.vcxproj b/msvc/RovastarDarkSecret.vcxproj index ab37a21afb..a3dcc6233c 100644 --- a/msvc/RovastarDarkSecret.vcxproj +++ b/msvc/RovastarDarkSecret.vcxproj @@ -53,7 +53,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -97,7 +97,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -175,13 +175,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/RovastarDriftingChaos.vcxproj b/msvc/RovastarDriftingChaos.vcxproj index de80d883a8..43f2daf2ba 100644 --- a/msvc/RovastarDriftingChaos.vcxproj +++ b/msvc/RovastarDriftingChaos.vcxproj @@ -53,7 +53,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -97,7 +97,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -175,13 +175,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/RovastarFractalSpiral.vcxproj b/msvc/RovastarFractalSpiral.vcxproj index 60807d90cf..aa8c33b759 100644 --- a/msvc/RovastarFractalSpiral.vcxproj +++ b/msvc/RovastarFractalSpiral.vcxproj @@ -53,7 +53,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -97,7 +97,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -175,13 +175,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/RovastarFractopiaFrantic.vcxproj b/msvc/RovastarFractopiaFrantic.vcxproj index f8bf2dc775..74c237c391 100644 --- a/msvc/RovastarFractopiaFrantic.vcxproj +++ b/msvc/RovastarFractopiaFrantic.vcxproj @@ -53,7 +53,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -97,7 +97,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -178,13 +178,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/packages.config b/msvc/packages.config index 3f34097e44..96f5eb6c0d 100644 --- a/msvc/packages.config +++ b/msvc/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/msvc/projectM.vcxproj b/msvc/projectM.vcxproj index 66edbb09fa..8f1f0588bc 100644 --- a/msvc/projectM.vcxproj +++ b/msvc/projectM.vcxproj @@ -49,7 +49,7 @@ - $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../src\libprojectM\MilkdropPresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../src\libprojectM\MilkdropPresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) %(AdditionalOptions) Debug/ EnableFastChecks @@ -84,7 +84,7 @@ - $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../src\libprojectM\MilkdropPresetFactory;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../src\libprojectM\NativePresetFactory;$(MSBuildThisFileDirectory)../src\libprojectM\MilkdropPresetFactory;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) %(AdditionalOptions) Release/ CompileAsCpp @@ -166,13 +166,4 @@ - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/msvc/projectMSDL.vcxproj b/msvc/projectMSDL.vcxproj index 4b38770bb7..fb31af2935 100644 --- a/msvc/projectMSDL.vcxproj +++ b/msvc/projectMSDL.vcxproj @@ -53,7 +53,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Debug/ EnableFastChecks CompileAsCpp @@ -97,7 +97,7 @@ - $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;%(AdditionalIncludeDirectories) + $(MSBuildThisFileDirectory)../src\libprojectM;$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)../src\libprojectM\Renderer;$(MSBuildThisFileDirectory)../vendor;%(AdditionalIncludeDirectories) Release/ CompileAsCpp Sync @@ -191,7 +191,6 @@ - @@ -199,7 +198,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. -