diff --git a/engine/UniQuake/stub/stub_opengl.c b/engine/UniQuake/stub/stub_opengl.c index b4cb7d8..e03f2cf 100644 --- a/engine/UniQuake/stub/stub_opengl.c +++ b/engine/UniQuake/stub/stub_opengl.c @@ -1,6 +1,7 @@ #ifndef USE_OPENGL #define BUILD_GL32 #include "stub_opengl.h" +#include #if !defined(__WIN32__) #undef GLAPI diff --git a/engine/Windows/VisualStudio/uniquake.vcxproj b/engine/Windows/VisualStudio/uniquake.vcxproj index 213006f..b286060 100644 --- a/engine/Windows/VisualStudio/uniquake.vcxproj +++ b/engine/Windows/VisualStudio/uniquake.vcxproj @@ -116,13 +116,13 @@ true - Application + DynamicLibrary v141 NotSet true - Application + DynamicLibrary v141 NotSet true @@ -633,6 +633,8 @@ copy "$(TargetDir)$(TargetName).pdb" $(SolutionDir)..\..\..\Assets\Plugins\gamec ProgramDatabase CompileAsC C11 + NormalWarnings + true libScePosix_stub_weak.a;libfmodL_stub_weak.a;%(AdditionalDependencies) @@ -660,6 +662,8 @@ copy "$(TargetDir)$(TargetName).pdb" $(SolutionDir)..\..\..\Assets\Plugins\gamec ProgramDatabase CompileAsC C11 + NormalWarnings + true libScePosix_stub_weak.a;libfmodL_stub_weak.a;%(AdditionalDependencies) @@ -761,8 +765,8 @@ copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)" MaxSpeed true - ..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX;%(PreprocessorDefinitions) + ..\..\UniQuake\stub;..\..\FMOD\inc;..\..\Quake;%(AdditionalIncludeDirectories) + UNIQUAKE_EXPORTS;USE_FMOD;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -770,18 +774,22 @@ copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)" Level3 ProgramDatabase CompileAsC + NormalWarnings + Level3 + true + C11 + true - libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmad.lib;libmikmod.lib;ws2_32.lib;opengl32.lib;winmm.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies) - ..\codecs\x64;..\SDL2\lib64;%(AdditionalLibraryDirectories) + libScePosix_stub_weak.a;libfmod_stub_weak.a;%(AdditionalDependencies) + ..\..\FMOD\lib\orbis;%(AdditionalLibraryDirectories) true Windows true true - copy "$(SolutionDir)\..\codecs\x64\*.dll" "$(TargetDir)" -copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)" + copy "$(TargetDir)$(TargetName).prx" $(SolutionDir)..\..\..\Assets\Plugins\orbis\uniquake.prx @@ -789,8 +797,8 @@ copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)" MaxSpeed true - ..\SDL2\include;..\codecs\include;..\misc\include;..\..\Quake;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USE_WINSOCK2;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;USE_SDL2;USE_CODEC_MP3;USE_CODEC_VORBIS;USE_CODEC_WAVE;USE_CODEC_FLAC;USE_CODEC_OPUS;USE_CODEC_MIKMOD;USE_CODEC_UMX;%(PreprocessorDefinitions) + ..\..\UniQuake\stub;..\..\FMOD\inc;..\..\Quake;%(AdditionalIncludeDirectories) + UNIQUAKE_EXPORTS;USE_FMOD;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -798,18 +806,22 @@ copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)" Level3 ProgramDatabase CompileAsC + NormalWarnings + true + Level3 + true + C11 - libvorbisfile.lib;libvorbis.lib;libopusfile.lib;libopus.lib;libFLAC.lib;libogg.lib;libmad.lib;libmikmod.lib;ws2_32.lib;opengl32.lib;winmm.lib;SDL2.lib;SDL2main.lib;%(AdditionalDependencies) - ..\codecs\x64;..\SDL2\lib64;%(AdditionalLibraryDirectories) + libScePosix_stub_weak.a;libfmod_stub_weak.a;%(AdditionalDependencies) + ..\..\FMOD\lib\prospero;%(AdditionalLibraryDirectories) true Windows true true - copy "$(SolutionDir)\..\codecs\x64\*.dll" "$(TargetDir)" -copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)" + copy "$(TargetDir)$(TargetName).prx" $(SolutionDir)..\..\..\Assets\Plugins\prospero\uniquake.prx