diff --git a/build/msbuild/lol.config.props b/build/msbuild/lol.config.props index 6123df7d..197485dc 100644 --- a/build/msbuild/lol.config.props +++ b/build/msbuild/lol.config.props @@ -40,12 +40,10 @@ - Select the platform toolset depending on the platform --> - v120 - v140 + v140 - v120 - v140 + v140 $(IntDir)/%(Directory)/ - $(SolutionDir)\..\src;$(SolutionDir)\..\src\bullet;$(SolutionDir)\..\tools\lolunit;$(PegtlIncludes);$(ImguiIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories) + $(LolDir)\src;$(LolDir)\src\bullet;$(LolDir)\tools\lolunit;$(PegtlIncludes);$(ImguiIncludes);$(BtPhysIncludes);%(AdditionalIncludeDirectories) $(GlIncludes);$(SdlIncludes);$(FfmpegIncludes);$(AssimpIncludes);$(XinputIncludes);%(AdditionalIncludeDirectories) $(GlIncludes);$(SdlIncludes);$(FfmpegIncludes);$(AssimpIncludes);$(XinputIncludes);%(AdditionalIncludeDirectories) NOMINMAX;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) diff --git a/build/msbuild/lol.vars.props b/build/msbuild/lol.vars.props index 7953899e..8ab55942 100644 --- a/build/msbuild/lol.vars.props +++ b/build/msbuild/lol.vars.props @@ -2,7 +2,7 @@ - $(SolutionDir)\..\external + $(LolDir)\external $(ExternalDir)\pegtl-1.3.1-e7752e81 @@ -146,10 +146,10 @@ - - $(SolutionDir)..\binaries\$(Platform) $(PlatformToolset) $(Configuration)\ - $(SolutionDir)..\binaries\$(Platform) $(PlatformToolset) $(Configuration)\$(ProjectName)\ + $(SolutionDir)\binaries + $(LolDir)\binaries + $(BinDir)\$(Platform) $(PlatformToolset) $(Configuration)\ + $(BinDir)\$(Platform) $(PlatformToolset) $(Configuration)\$(ProjectName)\ diff --git a/doc/samples/benchsuite.vcxproj b/doc/samples/benchsuite.vcxproj index 187f285e..ade4b479 100644 --- a/doc/samples/benchsuite.vcxproj +++ b/doc/samples/benchsuite.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -34,13 +38,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -49,19 +53,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/samples/btphystest.vcxproj b/doc/samples/btphystest.vcxproj index 23d1a630..17108b48 100644 --- a/doc/samples/btphystest.vcxproj +++ b/doc/samples/btphystest.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -44,13 +48,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -67,19 +71,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/samples/meshviewer/meshviewer.vcxproj b/doc/samples/meshviewer/meshviewer.vcxproj index 338578ac..a8e65ca9 100644 --- a/doc/samples/meshviewer/meshviewer.vcxproj +++ b/doc/samples/meshviewer/meshviewer.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -31,13 +35,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -106,19 +110,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/samples/nacl_phystest.vcxproj b/doc/samples/nacl_phystest.vcxproj index 2b81ef5e..22f5dc55 100644 --- a/doc/samples/nacl_phystest.vcxproj +++ b/doc/samples/nacl_phystest.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -33,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -53,19 +57,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/01_triangle.vcxproj b/doc/tutorial/01_triangle.vcxproj index 33d93303..54594e0f 100644 --- a/doc/tutorial/01_triangle.vcxproj +++ b/doc/tutorial/01_triangle.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -33,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -48,19 +52,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/02_cube.vcxproj b/doc/tutorial/02_cube.vcxproj index 215e666d..b26ee605 100644 --- a/doc/tutorial/02_cube.vcxproj +++ b/doc/tutorial/02_cube.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -33,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -48,19 +52,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/03_noise.vcxproj b/doc/tutorial/03_noise.vcxproj index cde4fc38..ebcea3ec 100644 --- a/doc/tutorial/03_noise.vcxproj +++ b/doc/tutorial/03_noise.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -33,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -48,19 +52,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/04_texture.vcxproj b/doc/tutorial/04_texture.vcxproj index 472e27e4..6474d631 100644 --- a/doc/tutorial/04_texture.vcxproj +++ b/doc/tutorial/04_texture.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -33,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -48,19 +52,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/05_easymesh.vcxproj b/doc/tutorial/05_easymesh.vcxproj index 66ea7778..8525c0a5 100644 --- a/doc/tutorial/05_easymesh.vcxproj +++ b/doc/tutorial/05_easymesh.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -30,13 +34,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -50,19 +54,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/06_sprite.vcxproj b/doc/tutorial/06_sprite.vcxproj index d50e4940..317e358b 100644 --- a/doc/tutorial/06_sprite.vcxproj +++ b/doc/tutorial/06_sprite.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -30,13 +34,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -45,19 +49,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/07_input.vcxproj b/doc/tutorial/07_input.vcxproj index 89d1d231..39e266f7 100644 --- a/doc/tutorial/07_input.vcxproj +++ b/doc/tutorial/07_input.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -33,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -48,19 +52,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/08_fbo.vcxproj b/doc/tutorial/08_fbo.vcxproj index b06901e9..7c5a4ee6 100644 --- a/doc/tutorial/08_fbo.vcxproj +++ b/doc/tutorial/08_fbo.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -33,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -48,19 +52,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/11_fractal.vcxproj b/doc/tutorial/11_fractal.vcxproj index 9b4a206f..35449a90 100644 --- a/doc/tutorial/11_fractal.vcxproj +++ b/doc/tutorial/11_fractal.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -33,13 +37,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -48,19 +52,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/12_voronoi.vcxproj b/doc/tutorial/12_voronoi.vcxproj index 5062f010..ce23c039 100644 --- a/doc/tutorial/12_voronoi.vcxproj +++ b/doc/tutorial/12_voronoi.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -37,13 +41,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -52,19 +56,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/13_shader_builder.vcxproj b/doc/tutorial/13_shader_builder.vcxproj index edf7bb4d..58c10641 100644 --- a/doc/tutorial/13_shader_builder.vcxproj +++ b/doc/tutorial/13_shader_builder.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -27,13 +31,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -45,19 +49,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/doc/tutorial/14_lol_lua.vcxproj b/doc/tutorial/14_lol_lua.vcxproj index b058e734..c2894b10 100644 --- a/doc/tutorial/14_lol_lua.vcxproj +++ b/doc/tutorial/14_lol_lua.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -27,13 +31,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -50,19 +54,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/src/bullet/lol-bullet.vcxproj b/src/bullet/lol-bullet.vcxproj index d2d20c62..5c65706e 100644 --- a/src/bullet/lol-bullet.vcxproj +++ b/src/bullet/lol-bullet.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -31,7 +35,7 @@ StaticLibrary Win32Proj - + MultiByte @@ -44,10 +48,10 @@ - + - + _LIB;%(PreprocessorDefinitions) @@ -583,6 +587,6 @@ - + diff --git a/src/lol-core.vcxproj b/src/lol-core.vcxproj index 40ce3ada..b43a7152 100644 --- a/src/lol-core.vcxproj +++ b/src/lol-core.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -31,7 +35,7 @@ StaticLibrary Win32Proj - + true MultiByte @@ -58,14 +62,14 @@ MultiByte - + - + - + _LIB;%(PreprocessorDefinitions);LOL_INPUT_V2 @@ -386,6 +390,6 @@ - + diff --git a/src/lua/lol-lua.vcxproj b/src/lua/lol-lua.vcxproj index 096d8728..984f905e 100644 --- a/src/lua/lol-lua.vcxproj +++ b/src/lua/lol-lua.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -31,7 +35,7 @@ StaticLibrary Win32Proj - + MultiByte @@ -44,10 +48,10 @@ - + - + LUA_ANSI;%(PreprocessorDefinitions) @@ -124,6 +128,6 @@ - + diff --git a/src/t/test-base.vcxproj b/src/t/test-base.vcxproj index b35d036e..efc687e0 100644 --- a/src/t/test-base.vcxproj +++ b/src/t/test-base.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -35,13 +39,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -50,19 +54,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/src/t/test-entity.vcxproj b/src/t/test-entity.vcxproj index 8102222c..7a69db61 100644 --- a/src/t/test-entity.vcxproj +++ b/src/t/test-entity.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -31,13 +35,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -46,19 +50,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/src/t/test-image.vcxproj b/src/t/test-image.vcxproj index 14300e36..7e5fb4e4 100644 --- a/src/t/test-image.vcxproj +++ b/src/t/test-image.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -32,13 +36,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -47,19 +51,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/src/t/test-math.vcxproj b/src/t/test-math.vcxproj index 642c8bb0..d8b4edd8 100644 --- a/src/t/test-math.vcxproj +++ b/src/t/test-math.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -48,13 +52,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -63,19 +67,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/src/t/test-sys.vcxproj b/src/t/test-sys.vcxproj index 66b56728..928d3632 100644 --- a/src/t/test-sys.vcxproj +++ b/src/t/test-sys.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -31,13 +35,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -46,19 +50,19 @@ Application Win32Proj - + - + - + - + - + diff --git a/tools/lolremez/lolremez.vcxproj b/tools/lolremez/lolremez.vcxproj index 8137b11d..0041a87c 100644 --- a/tools/lolremez/lolremez.vcxproj +++ b/tools/lolremez/lolremez.vcxproj @@ -1,5 +1,9 @@  + + $(SolutionDir)\lol + $(SolutionDir)\.. + Debug @@ -36,13 +40,13 @@ - + {9e62f2fe-3408-4eae-8238-fd84238ceeda} - + {83d3b207-c601-4025-8f41-01dedc354661} - + {d84021ca-b233-4e0f-8a52-071b83bbccc4} @@ -51,19 +55,19 @@ Application Win32Proj - + - + - + - + - +