diff --git a/GL/glext.h b/3rdparty/GL/glext.h similarity index 100% rename from GL/glext.h rename to 3rdparty/GL/glext.h diff --git a/OpenAL/include/al.h b/3rdparty/OpenAL/include/al.h similarity index 100% rename from OpenAL/include/al.h rename to 3rdparty/OpenAL/include/al.h diff --git a/OpenAL/include/alc.h b/3rdparty/OpenAL/include/alc.h similarity index 100% rename from OpenAL/include/alc.h rename to 3rdparty/OpenAL/include/alc.h diff --git a/OpenAL/include/alext.h b/3rdparty/OpenAL/include/alext.h similarity index 100% rename from OpenAL/include/alext.h rename to 3rdparty/OpenAL/include/alext.h diff --git a/OpenAL/include/efx-creative.h b/3rdparty/OpenAL/include/efx-creative.h similarity index 100% rename from OpenAL/include/efx-creative.h rename to 3rdparty/OpenAL/include/efx-creative.h diff --git a/OpenAL/include/efx-presets.h b/3rdparty/OpenAL/include/efx-presets.h similarity index 100% rename from OpenAL/include/efx-presets.h rename to 3rdparty/OpenAL/include/efx-presets.h diff --git a/OpenAL/include/efx.h b/3rdparty/OpenAL/include/efx.h similarity index 100% rename from OpenAL/include/efx.h rename to 3rdparty/OpenAL/include/efx.h diff --git a/OpenAL/libs/Win64/OpenAL32.def b/3rdparty/OpenAL/libs/Win64/OpenAL32.def similarity index 100% rename from OpenAL/libs/Win64/OpenAL32.def rename to 3rdparty/OpenAL/libs/Win64/OpenAL32.def diff --git a/OpenAL/libs/Win64/OpenAL32.lib b/3rdparty/OpenAL/libs/Win64/OpenAL32.lib similarity index 100% rename from OpenAL/libs/Win64/OpenAL32.lib rename to 3rdparty/OpenAL/libs/Win64/OpenAL32.lib diff --git a/minidx12/Include/d2d1.h b/3rdparty/minidx12/Include/d2d1.h similarity index 100% rename from minidx12/Include/d2d1.h rename to 3rdparty/minidx12/Include/d2d1.h diff --git a/minidx12/Include/d2d1_1.h b/3rdparty/minidx12/Include/d2d1_1.h similarity index 100% rename from minidx12/Include/d2d1_1.h rename to 3rdparty/minidx12/Include/d2d1_1.h diff --git a/minidx12/Include/d2d1_1helper.h b/3rdparty/minidx12/Include/d2d1_1helper.h similarity index 100% rename from minidx12/Include/d2d1_1helper.h rename to 3rdparty/minidx12/Include/d2d1_1helper.h diff --git a/minidx12/Include/d2d1_2.h b/3rdparty/minidx12/Include/d2d1_2.h similarity index 100% rename from minidx12/Include/d2d1_2.h rename to 3rdparty/minidx12/Include/d2d1_2.h diff --git a/minidx12/Include/d2d1_2helper.h b/3rdparty/minidx12/Include/d2d1_2helper.h similarity index 100% rename from minidx12/Include/d2d1_2helper.h rename to 3rdparty/minidx12/Include/d2d1_2helper.h diff --git a/minidx12/Include/d2d1_3.h b/3rdparty/minidx12/Include/d2d1_3.h similarity index 100% rename from minidx12/Include/d2d1_3.h rename to 3rdparty/minidx12/Include/d2d1_3.h diff --git a/minidx12/Include/d2d1_3helper.h b/3rdparty/minidx12/Include/d2d1_3helper.h similarity index 100% rename from minidx12/Include/d2d1_3helper.h rename to 3rdparty/minidx12/Include/d2d1_3helper.h diff --git a/minidx12/Include/d2d1effects.h b/3rdparty/minidx12/Include/d2d1effects.h similarity index 100% rename from minidx12/Include/d2d1effects.h rename to 3rdparty/minidx12/Include/d2d1effects.h diff --git a/minidx12/Include/d2d1effects_1.h b/3rdparty/minidx12/Include/d2d1effects_1.h similarity index 100% rename from minidx12/Include/d2d1effects_1.h rename to 3rdparty/minidx12/Include/d2d1effects_1.h diff --git a/minidx12/Include/d2d1effects_2.h b/3rdparty/minidx12/Include/d2d1effects_2.h similarity index 100% rename from minidx12/Include/d2d1effects_2.h rename to 3rdparty/minidx12/Include/d2d1effects_2.h diff --git a/minidx12/Include/d3d10.h b/3rdparty/minidx12/Include/d3d10.h similarity index 100% rename from minidx12/Include/d3d10.h rename to 3rdparty/minidx12/Include/d3d10.h diff --git a/minidx12/Include/d3d10_1.h b/3rdparty/minidx12/Include/d3d10_1.h similarity index 100% rename from minidx12/Include/d3d10_1.h rename to 3rdparty/minidx12/Include/d3d10_1.h diff --git a/minidx12/Include/d3d10_1shader.h b/3rdparty/minidx12/Include/d3d10_1shader.h similarity index 100% rename from minidx12/Include/d3d10_1shader.h rename to 3rdparty/minidx12/Include/d3d10_1shader.h diff --git a/minidx12/Include/d3d11.h b/3rdparty/minidx12/Include/d3d11.h similarity index 100% rename from minidx12/Include/d3d11.h rename to 3rdparty/minidx12/Include/d3d11.h diff --git a/minidx12/Include/d3d11_1.h b/3rdparty/minidx12/Include/d3d11_1.h similarity index 100% rename from minidx12/Include/d3d11_1.h rename to 3rdparty/minidx12/Include/d3d11_1.h diff --git a/minidx12/Include/d3d11_2.h b/3rdparty/minidx12/Include/d3d11_2.h similarity index 100% rename from minidx12/Include/d3d11_2.h rename to 3rdparty/minidx12/Include/d3d11_2.h diff --git a/minidx12/Include/d3d11_3.h b/3rdparty/minidx12/Include/d3d11_3.h similarity index 100% rename from minidx12/Include/d3d11_3.h rename to 3rdparty/minidx12/Include/d3d11_3.h diff --git a/minidx12/Include/d3d11on12.h b/3rdparty/minidx12/Include/d3d11on12.h similarity index 100% rename from minidx12/Include/d3d11on12.h rename to 3rdparty/minidx12/Include/d3d11on12.h diff --git a/minidx12/Include/d3d11shader.h b/3rdparty/minidx12/Include/d3d11shader.h similarity index 100% rename from minidx12/Include/d3d11shader.h rename to 3rdparty/minidx12/Include/d3d11shader.h diff --git a/minidx12/Include/d3d12.h b/3rdparty/minidx12/Include/d3d12.h similarity index 100% rename from minidx12/Include/d3d12.h rename to 3rdparty/minidx12/Include/d3d12.h diff --git a/minidx12/Include/d3d12sdklayers.h b/3rdparty/minidx12/Include/d3d12sdklayers.h similarity index 100% rename from minidx12/Include/d3d12sdklayers.h rename to 3rdparty/minidx12/Include/d3d12sdklayers.h diff --git a/minidx12/Include/d3dcommon.h b/3rdparty/minidx12/Include/d3dcommon.h similarity index 100% rename from minidx12/Include/d3dcommon.h rename to 3rdparty/minidx12/Include/d3dcommon.h diff --git a/minidx12/Include/dcommon.h b/3rdparty/minidx12/Include/dcommon.h similarity index 100% rename from minidx12/Include/dcommon.h rename to 3rdparty/minidx12/Include/dcommon.h diff --git a/minidx12/Include/dwrite.h b/3rdparty/minidx12/Include/dwrite.h similarity index 100% rename from minidx12/Include/dwrite.h rename to 3rdparty/minidx12/Include/dwrite.h diff --git a/minidx12/Include/dwrite_1.h b/3rdparty/minidx12/Include/dwrite_1.h similarity index 100% rename from minidx12/Include/dwrite_1.h rename to 3rdparty/minidx12/Include/dwrite_1.h diff --git a/minidx12/Include/dwrite_2.h b/3rdparty/minidx12/Include/dwrite_2.h similarity index 100% rename from minidx12/Include/dwrite_2.h rename to 3rdparty/minidx12/Include/dwrite_2.h diff --git a/minidx12/Include/dwrite_3.h b/3rdparty/minidx12/Include/dwrite_3.h similarity index 100% rename from minidx12/Include/dwrite_3.h rename to 3rdparty/minidx12/Include/dwrite_3.h diff --git a/minidx12/Include/dxgi.h b/3rdparty/minidx12/Include/dxgi.h similarity index 100% rename from minidx12/Include/dxgi.h rename to 3rdparty/minidx12/Include/dxgi.h diff --git a/minidx12/Include/dxgi1_2.h b/3rdparty/minidx12/Include/dxgi1_2.h similarity index 100% rename from minidx12/Include/dxgi1_2.h rename to 3rdparty/minidx12/Include/dxgi1_2.h diff --git a/minidx12/Include/dxgi1_3.h b/3rdparty/minidx12/Include/dxgi1_3.h similarity index 100% rename from minidx12/Include/dxgi1_3.h rename to 3rdparty/minidx12/Include/dxgi1_3.h diff --git a/minidx12/Include/dxgi1_4.h b/3rdparty/minidx12/Include/dxgi1_4.h similarity index 100% rename from minidx12/Include/dxgi1_4.h rename to 3rdparty/minidx12/Include/dxgi1_4.h diff --git a/minidx12/Include/dxgiformat.h b/3rdparty/minidx12/Include/dxgiformat.h similarity index 100% rename from minidx12/Include/dxgiformat.h rename to 3rdparty/minidx12/Include/dxgiformat.h diff --git a/minidx12/Include/dxgitype.h b/3rdparty/minidx12/Include/dxgitype.h similarity index 100% rename from minidx12/Include/dxgitype.h rename to 3rdparty/minidx12/Include/dxgitype.h diff --git a/minidx12/Lib/d2d1.lib b/3rdparty/minidx12/Lib/d2d1.lib similarity index 100% rename from minidx12/Lib/d2d1.lib rename to 3rdparty/minidx12/Lib/d2d1.lib diff --git a/minidx12/Lib/dwrite.lib b/3rdparty/minidx12/Lib/dwrite.lib similarity index 100% rename from minidx12/Lib/dwrite.lib rename to 3rdparty/minidx12/Lib/dwrite.lib diff --git a/minidx12/Lib/dxgi.lib b/3rdparty/minidx12/Lib/dxgi.lib similarity index 100% rename from minidx12/Lib/dxgi.lib rename to 3rdparty/minidx12/Lib/dxgi.lib diff --git a/stblib/stb_image.h b/3rdparty/stblib/stb_image.h similarity index 100% rename from stblib/stb_image.h rename to 3rdparty/stblib/stb_image.h diff --git a/stblib/stb_truetype.h b/3rdparty/stblib/stb_truetype.h similarity index 100% rename from stblib/stb_truetype.h rename to 3rdparty/stblib/stb_truetype.h diff --git a/appveyor.yml b/appveyor.yml index df2a926c91..e7e00cbaab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,7 +28,7 @@ install: - ps: Start-FileDownload 'https://402331b94f8e4b87ae2ef4677347f7956cf3861f.googledrive.com/host/0B6v_qtb9hkicfmt0NG0wTTRtUmF4X3VTQk5Oc2JidEVKVnUteDA1dXdrYlNsVW9kREpsSHc/llvmlibs.7z' - ps: Start-FileDownload 'https://402331b94f8e4b87ae2ef4677347f7956cf3861f.googledrive.com/host/0B6v_qtb9hkicfmt0NG0wTTRtUmF4X3VTQk5Oc2JidEVKVnUteDA1dXdrYlNsVW9kREpsSHc/zlib.7z' - set WXWIN=C:\rpcs3\wxWidgets - - set OPENALDIR=C:\rpcs3\OpenAL + - set OPENALDIR=C:\rpcs3\3rdparty\OpenAL - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\wxWidgets;%PATH% - set COMMIT_SHA=%APPVEYOR_REPO_COMMIT:~0,8% diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 9eff077212..0568a23242 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -119,10 +119,13 @@ ${LLVM_INCLUDE_DIRS} "${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code" "${RPCS3_SRC_DIR}/../Vulkan/Vulkan-LoaderAndValidationLayers/include" "${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/Public" +# Includes 3rdparty stuff that isn't included yet +"${RPCS3_SRC_DIR}/../3rdparty/GL" +"${RPCS3_SRC_DIR}/../3rdparty/stblib" ) if(WIN32) include_directories(BEFORE "${RPCS3_SRC_DIR}/../minidx9/Include") - include_directories(BEFORE "${RPCS3_SRC_DIR}/../minidx12/Include") + include_directories(BEFORE "${RPCS3_SRC_DIR}/../3rdparty/minidx12/Include") endif() if(NOT LLVM_FOUND) @@ -146,7 +149,7 @@ endif() link_directories( "${RPCS3_SRC_DIR}/../asmjit/" -"${RPCS3_SRC_DIR}/../minidx12/" +"${RPCS3_SRC_DIR}/../3rdparty/minidx12/" ) if(MSVC OR NOT WIN32) diff --git a/rpcs3/Emu/Audio/AL/OpenALThread.h b/rpcs3/Emu/Audio/AL/OpenALThread.h index a02a100435..3e793e6617 100644 --- a/rpcs3/Emu/Audio/AL/OpenALThread.h +++ b/rpcs3/Emu/Audio/AL/OpenALThread.h @@ -1,7 +1,7 @@ #pragma once #include "Emu/Audio/AudioThread.h" -#include "OpenAL/include/alext.h" +#include "3rdparty/OpenAL/include/alext.h" class OpenALThread : public AudioThread { diff --git a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp index 033dee93b5..36e271cf1e 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp @@ -9,7 +9,7 @@ #include "Emu/RSX/GSRender.h" #include "../rsx_methods.h" -#include "D3D12.h" +#include #include "D3D12GSRender.h" #include "D3D12Formats.h" diff --git a/rpcs3/Emu/RSX/D3D12/d3dx12.h b/rpcs3/Emu/RSX/D3D12/d3dx12.h index 2e79a23489..5b1f1ccaa9 100644 --- a/rpcs3/Emu/RSX/D3D12/d3dx12.h +++ b/rpcs3/Emu/RSX/D3D12/d3dx12.h @@ -10,7 +10,7 @@ #ifndef __D3DX12_H__ #define __D3DX12_H__ -#include "d3d12.h" +#include #if defined( __cplusplus ) diff --git a/rpcs3/Emu/RSX/GL/OpenGL.h b/rpcs3/Emu/RSX/GL/OpenGL.h index 9f1ca10845..3c51a2792a 100644 --- a/rpcs3/Emu/RSX/GL/OpenGL.h +++ b/rpcs3/Emu/RSX/GL/OpenGL.h @@ -6,7 +6,7 @@ #ifdef _WIN32 #include #include "GL/gl.h" -#include "GL/glext.h" +#include typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval); #define OPENGL_PROC(p, n) extern p gl##n diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index 396cddeaf1..adae60dc89 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -4,7 +4,7 @@ // Defines STB_TRUETYPE_IMPLEMENTATION *once* before including stb_truetype.h (as noted in stb_truetype.h's comments) #define STB_TRUETYPE_IMPLEMENTATION -#include "stblib/stb_truetype.h" +#include #include "Emu/FS/vfsFile.h" #include "cellFont.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index 97aa40ae3c..4cef65232d 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -5,7 +5,7 @@ #include "Emu/SysCalls/Modules.h" // STB_IMAGE_IMPLEMENTATION is already defined in stb_image.cpp -#include "stblib/stb_image.h" +#include #include "Emu/FS/VFS.h" #include "Emu/FS/vfsFileBase.h" diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index e2d235a19a..0c5ded73b9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -5,7 +5,7 @@ #include "Emu/SysCalls/Modules.h" // STB_IMAGE_IMPLEMENTATION is already defined in stb_image.cpp -#include "stblib/stb_image.h" +#include #include "Emu/FS/VFS.h" #include "Emu/FS/vfsFileBase.h" diff --git a/rpcs3/OpenAL.vcxproj b/rpcs3/OpenAL.vcxproj index 3989b340ff..7dfff65312 100644 --- a/rpcs3/OpenAL.vcxproj +++ b/rpcs3/OpenAL.vcxproj @@ -64,7 +64,7 @@ - .\OpenAL\include;%(AdditionalIncludeDirectories) + .\3rdparty\OpenAL\include;%(AdditionalIncludeDirectories) diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj index 63b3a58304..dc4614195d 100644 --- a/rpcs3/rpcs3.vcxproj +++ b/rpcs3/rpcs3.vcxproj @@ -91,14 +91,14 @@ false - ..\minidx9\Include;..\OpenAL\include;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) + ..\minidx9\Include;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories) - ..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) - ..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) - ..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) - ..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\Vulkan-build\loader\Release;..\Vulkan\glslang-build\glslang\Release;..\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) - ..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\Vulkan-build\loader\Release;..\Vulkan\glslang-build\glslang\Release;..\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) + ..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) + ..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) + ..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) + ..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\Vulkan-build\loader\Release;..\Vulkan\glslang-build\glslang\Release;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) + ..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\Vulkan-build\loader\Release;..\Vulkan\glslang-build\glslang\Release;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories) VKstatic.1.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;%(AdditionalDependencies) diff --git a/rpcs3/stb_image.cpp b/rpcs3/stb_image.cpp index 1d425d85f8..0cc9a34afe 100644 --- a/rpcs3/stb_image.cpp +++ b/rpcs3/stb_image.cpp @@ -1,4 +1,4 @@ #include "stdafx.h" // Defines STB_IMAGE_IMPLEMENTATION *once* for stb_image.h includes (Should this be placed somewhere else?) #define STB_IMAGE_IMPLEMENTATION -#include "stblib/stb_image.h" +#include diff --git a/rpcs3_default.props b/rpcs3_default.props index 3361d6d67c..3ef010febf 100644 --- a/rpcs3_default.props +++ b/rpcs3_default.props @@ -3,7 +3,11 @@ +<<<<<<< HEAD .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\wxWidgets\src\zlib;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\minidx12\Include;..\glm;..\GSL\include;..\libpng +======= + .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\glm;..\GSL\include;..\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include +>>>>>>> 07c1ee3... Moves GL, minidx12, OpenAL, stblib to 3rdparty $(SolutionDir)lib\$(Configuration)-$(Platform)\ $(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\