diff options
| author | Ray <raysan5@gmail.com> | 2017-11-05 09:58:31 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2017-11-05 09:58:31 +0100 |
| commit | 5f65380732c7b0528712d1886f1186087f2ce3bc (patch) | |
| tree | 4e2988693b6b122f076ec925154850347b94364f | |
| parent | aa6a1b4283c8c35b5edb706f3a0110ca6c82878b (diff) | |
| parent | 36ae9c8c3a91798606ad9595b57d11329c60fc36 (diff) | |
| download | raylib-5f65380732c7b0528712d1886f1186087f2ce3bc.tar.gz raylib-5f65380732c7b0528712d1886f1186087f2ce3bc.zip | |
Merge branch 'develop' of https://github.com/raysan5/raylib into develop
| -rw-r--r-- | project/vs2015/raylib/raylib.dll.vcxproj | 6 | ||||
| -rw-r--r-- | release/libs/win32/msvc/raylib.dll | bin | 451072 -> 593920 bytes | |||
| -rw-r--r-- | release/libs/win32/msvc/raylibdll.lib | bin | 63284 -> 64760 bytes |
3 files changed, 4 insertions, 2 deletions
diff --git a/project/vs2015/raylib/raylib.dll.vcxproj b/project/vs2015/raylib/raylib.dll.vcxproj index e9f12e00..418151b0 100644 --- a/project/vs2015/raylib/raylib.dll.vcxproj +++ b/project/vs2015/raylib/raylib.dll.vcxproj @@ -59,11 +59,12 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);GRAPHICS_API_OPENGL_33;PLATFORM_DESKTOP;BUILD_LIBTYPE_SHARED</PreprocessorDefinitions> <CompileAs>CompileAsC</CompileAs> <AdditionalIncludeDirectories>$(SolutionDir)..\..\release\include</AdditionalIncludeDirectories> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <AdditionalLibraryDirectories>$(SolutionDir)..\..\release\libs\win32\msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glfw3.lib;openal32dll.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glfw3dll.lib;openal32dll.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <Lib> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> @@ -80,13 +81,14 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);GRAPHICS_API_OPENGL_33;PLATFORM_DESKTOP;BUILD_LIBTYPE_SHARED</PreprocessorDefinitions> <AdditionalIncludeDirectories>$(SolutionDir)..\..\release\include</AdditionalIncludeDirectories> <CompileAs>CompileAsC</CompileAs> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <AdditionalLibraryDirectories>$(SolutionDir)..\..\release\libs\win32\msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glfw3.lib;openal32dll.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;glfw3dll.lib;openal32dll.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/release/libs/win32/msvc/raylib.dll b/release/libs/win32/msvc/raylib.dll Binary files differindex 5eb531f7..b9896ff8 100644 --- a/release/libs/win32/msvc/raylib.dll +++ b/release/libs/win32/msvc/raylib.dll diff --git a/release/libs/win32/msvc/raylibdll.lib b/release/libs/win32/msvc/raylibdll.lib Binary files differindex 87f5d7c4..8ad371ae 100644 --- a/release/libs/win32/msvc/raylibdll.lib +++ b/release/libs/win32/msvc/raylibdll.lib |