diff options
| author | Ray <raysan5@gmail.com> | 2019-06-06 14:23:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 14:23:37 +0200 |
| commit | e1f3f84e84c3f3b8cb831791b8400e50340e4064 (patch) | |
| tree | 50de99d34eaec10b4d345da6999d81f896c54779 | |
| parent | 566a8d17c86864dfe589c43c7320cb30ad6bea2a (diff) | |
| parent | eb1b2535f6ef5f5adb609f5e8741b20c633e15de (diff) | |
| download | raylib-e1f3f84e84c3f3b8cb831791b8400e50340e4064.tar.gz raylib-e1f3f84e84c3f3b8cb831791b8400e50340e4064.zip | |
Merge pull request #873 from msmshazan/ANGLE-fix
Changed ANGLE binaries location
| -rw-r--r-- | projects/VS2017.ANGLE/examples/core_basic_window.vcxproj | 4 | ||||
| -rw-r--r-- | projects/VS2017.ANGLE/examples/core_basic_window_cpp.vcxproj | 4 | ||||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x64/d3dcompiler_47.dll (renamed from src/external/ANGLE/lib/x64/d3dcompiler_47.dll) | bin | 4493352 -> 4493352 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x64/libEGL.dll (renamed from src/external/ANGLE/lib/x64/libEGL.dll) | bin | 62976 -> 62976 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x64/libEGL.lib (renamed from src/external/ANGLE/lib/x64/libEGL.lib) | bin | 14164 -> 14164 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x64/libGLESv2.dll (renamed from src/external/ANGLE/lib/x64/libGLESv2.dll) | bin | 18712576 -> 18712576 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x64/libGLESv2.lib (renamed from src/external/ANGLE/lib/x64/libGLESv2.lib) | bin | 548600 -> 548600 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x86/d3dcompiler_47.dll (renamed from src/external/ANGLE/lib/x86/d3dcompiler_47.dll) | bin | 3705472 -> 3705472 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x86/libEGL.dll (renamed from src/external/ANGLE/lib/x86/libEGL.dll) | bin | 51712 -> 51712 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x86/libEGL.lib (renamed from src/external/ANGLE/lib/x86/libEGL.lib) | bin | 14992 -> 14992 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x86/libGLESv2.dll (renamed from src/external/ANGLE/lib/x86/libGLESv2.dll) | bin | 16666624 -> 16666624 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/lib/x86/libGLESv2.lib (renamed from src/external/ANGLE/lib/x86/libGLESv2.lib) | bin | 575538 -> 575538 bytes | |||
| -rw-r--r-- | projects/VS2017.ANGLE/raylib/raylib.vcxproj | 4 |
13 files changed, 6 insertions, 6 deletions
diff --git a/projects/VS2017.ANGLE/examples/core_basic_window.vcxproj b/projects/VS2017.ANGLE/examples/core_basic_window.vcxproj index d9bd0618..cf7b42aa 100644 --- a/projects/VS2017.ANGLE/examples/core_basic_window.vcxproj +++ b/projects/VS2017.ANGLE/examples/core_basic_window.vcxproj @@ -107,7 +107,7 @@ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PostBuildEvent> - <Command>xcopy $(SolutionDir)..\..\src\external\ANGLE\lib\$(PlatformTarget)\*.dll $(OutDir) /Y /E /Q</Command> + <Command>xcopy $(SolutionDir)lib\$(PlatformTarget)\*.dll $(OutDir) /Y /E /Q</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|Win32'"> @@ -152,7 +152,7 @@ <AdditionalLibraryDirectories>$(SolutionDir)deps;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> <PostBuildEvent> - <Command>xcopy $(SolutionDir)..\..\src\external\ANGLE\lib\$(PlatformTarget)\*.dll $(OutDir) /Y /E /Q</Command> + <Command>xcopy $(SolutionDir)lib\$(PlatformTarget)\*.dll $(OutDir) /Y /E /Q</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|Win32'"> diff --git a/projects/VS2017.ANGLE/examples/core_basic_window_cpp.vcxproj b/projects/VS2017.ANGLE/examples/core_basic_window_cpp.vcxproj index 729f07ff..72ead7ad 100644 --- a/projects/VS2017.ANGLE/examples/core_basic_window_cpp.vcxproj +++ b/projects/VS2017.ANGLE/examples/core_basic_window_cpp.vcxproj @@ -107,7 +107,7 @@ <AdditionalLibraryDirectories>$(SolutionDir)..\..\release\libs\win32\msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Link> <PostBuildEvent> - <Command>xcopy $(SolutionDir)..\..\src\external\ANGLE\lib\$(PlatformTarget)\*.dll $(OutDir) /Y /E /Q</Command> + <Command>xcopy $(SolutionDir)lib\$(PlatformTarget)\*.dll $(OutDir) /Y /E /Q</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|Win32'"> @@ -151,7 +151,7 @@ <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <PostBuildEvent> - <Command>xcopy $(SolutionDir)..\..\src\external\ANGLE\lib\$(PlatformTarget)\*.dll $(OutDir) /Y /E /Q</Command> + <Command>xcopy $(SolutionDir)lib\$(PlatformTarget)\*.dll $(OutDir) /Y /E /Q</Command> </PostBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|Win32'"> diff --git a/src/external/ANGLE/lib/x64/d3dcompiler_47.dll b/projects/VS2017.ANGLE/lib/x64/d3dcompiler_47.dll Binary files differindex 47040da0..47040da0 100644 --- a/src/external/ANGLE/lib/x64/d3dcompiler_47.dll +++ b/projects/VS2017.ANGLE/lib/x64/d3dcompiler_47.dll diff --git a/src/external/ANGLE/lib/x64/libEGL.dll b/projects/VS2017.ANGLE/lib/x64/libEGL.dll Binary files differindex 71c20a7a..71c20a7a 100644 --- a/src/external/ANGLE/lib/x64/libEGL.dll +++ b/projects/VS2017.ANGLE/lib/x64/libEGL.dll diff --git a/src/external/ANGLE/lib/x64/libEGL.lib b/projects/VS2017.ANGLE/lib/x64/libEGL.lib Binary files differindex b440f78c..b440f78c 100644 --- a/src/external/ANGLE/lib/x64/libEGL.lib +++ b/projects/VS2017.ANGLE/lib/x64/libEGL.lib diff --git a/src/external/ANGLE/lib/x64/libGLESv2.dll b/projects/VS2017.ANGLE/lib/x64/libGLESv2.dll Binary files differindex 66fcba06..66fcba06 100644 --- a/src/external/ANGLE/lib/x64/libGLESv2.dll +++ b/projects/VS2017.ANGLE/lib/x64/libGLESv2.dll diff --git a/src/external/ANGLE/lib/x64/libGLESv2.lib b/projects/VS2017.ANGLE/lib/x64/libGLESv2.lib Binary files differindex af5ba5ad..af5ba5ad 100644 --- a/src/external/ANGLE/lib/x64/libGLESv2.lib +++ b/projects/VS2017.ANGLE/lib/x64/libGLESv2.lib diff --git a/src/external/ANGLE/lib/x86/d3dcompiler_47.dll b/projects/VS2017.ANGLE/lib/x86/d3dcompiler_47.dll Binary files differindex 4ffad2d7..4ffad2d7 100644 --- a/src/external/ANGLE/lib/x86/d3dcompiler_47.dll +++ b/projects/VS2017.ANGLE/lib/x86/d3dcompiler_47.dll diff --git a/src/external/ANGLE/lib/x86/libEGL.dll b/projects/VS2017.ANGLE/lib/x86/libEGL.dll Binary files differindex a9cb4a9a..a9cb4a9a 100644 --- a/src/external/ANGLE/lib/x86/libEGL.dll +++ b/projects/VS2017.ANGLE/lib/x86/libEGL.dll diff --git a/src/external/ANGLE/lib/x86/libEGL.lib b/projects/VS2017.ANGLE/lib/x86/libEGL.lib Binary files differindex 1954ceb3..1954ceb3 100644 --- a/src/external/ANGLE/lib/x86/libEGL.lib +++ b/projects/VS2017.ANGLE/lib/x86/libEGL.lib diff --git a/src/external/ANGLE/lib/x86/libGLESv2.dll b/projects/VS2017.ANGLE/lib/x86/libGLESv2.dll Binary files differindex 47a71ff7..47a71ff7 100644 --- a/src/external/ANGLE/lib/x86/libGLESv2.dll +++ b/projects/VS2017.ANGLE/lib/x86/libGLESv2.dll diff --git a/src/external/ANGLE/lib/x86/libGLESv2.lib b/projects/VS2017.ANGLE/lib/x86/libGLESv2.lib Binary files differindex 562310cc..562310cc 100644 --- a/src/external/ANGLE/lib/x86/libGLESv2.lib +++ b/projects/VS2017.ANGLE/lib/x86/libGLESv2.lib diff --git a/projects/VS2017.ANGLE/raylib/raylib.vcxproj b/projects/VS2017.ANGLE/raylib/raylib.vcxproj index e6d66e3b..5c97eb60 100644 --- a/projects/VS2017.ANGLE/raylib/raylib.vcxproj +++ b/projects/VS2017.ANGLE/raylib/raylib.vcxproj @@ -97,7 +97,7 @@ <SubSystem>Windows</SubSystem> </Link> <Lib> - <AdditionalLibraryDirectories>$(SolutionDir)..\..\src\external\ANGLE\lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(SolutionDir)lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>libEGL.lib;libGLESv2.lib</AdditionalDependencies> </Lib> </ItemDefinitionGroup> @@ -137,7 +137,7 @@ <OptimizeReferences>true</OptimizeReferences> </Link> <Lib> - <AdditionalLibraryDirectories>$(SolutionDir)..\..\src\external\ANGLE\lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(SolutionDir)lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>libEGL.lib;libGLESv2.lib</AdditionalDependencies> </Lib> </ItemDefinitionGroup> |
