Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platforms/sdl/base/AppPlatform_sdl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void AppPlatform_sdl::_ensureDirectoryExists(const char* path)
if (stat(path, &obj) != 0 || !S_ISDIR(obj.st_mode))
{
// Create Screenshots Folder
#if defined(_WIN32) && !defined(__MINGW32__)
#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__clang__)
int ret = XPL_MKDIR(path);
#else
int ret = XPL_MKDIR(path, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
Expand Down
1 change: 1 addition & 0 deletions platforms/sound/directsound/SoundSystemDS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define WIN32_LEAN_AND_MEAN
#include "CustomSoundSystem.hpp"
#include "common/Logger.hpp"
#include "common/Utils.hpp"
#include "client/app/AppPlatform.hpp"

// @TODO: fix crash in playAt when Asan is active
Expand Down
3 changes: 3 additions & 0 deletions platforms/sound/openal/SoundSystemAL.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#include <assert.h>

#include "CustomSoundSystem.hpp"

#include "thirdparty/OpenAL.h"
#include "common/Logger.hpp"
#include "common/Utils.hpp"

#include "SoundStreamAL.hpp"

Expand Down
1 change: 1 addition & 0 deletions platforms/windows/AppPlatform_win32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include "GameMods.hpp"
#include "common/Logger.hpp"
#include "common/Utils.hpp"
#include "renderer/RenderContextImmediate.hpp"

#if MCE_GFX_API_OGL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(MC_ROOT)\platforms\sound\openal;$(MC_ROOT)\thirdparty\stb_image\include;$(SDL2_PATH)\include;$(LIBPNG_PATH);$(OPENAL_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(MC_ROOT)\platforms\sound\openal;$(MC_ROOT)\thirdparty\stb_image\include;$(SDL2_PATH)\include;$(OPENAL_PATH)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand All @@ -46,15 +46,15 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
<Link>
<AdditionalLibraryDirectories>$(SDL2_PATH)\VisualC\Win32\Release;$(LIBPNG_PATH)\projects\vstudio\Release Library\;$(OPENAL_PATH)\libs\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SDL2_PATH)\VisualC\Win32\Release;$(OPENAL_PATH)\libs\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>copy $(SDL2_PATH)\VisualC\Win32\Release\SDL2.dll $(TargetDir) /y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
<Link>
<AdditionalLibraryDirectories>$(SDL2_PATH)\VisualC\x64\Release;$(LIBPNG_PATH)\projects\vstudio\x64\Release Library;$(OPENAL_PATH)\libs\Win64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SDL2_PATH)\VisualC\x64\Release;$(OPENAL_PATH)\libs\Win64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
<Command>copy $(SDL2_PATH)\VisualC\x64\Release\SDL2.dll $(TargetDir) /y</Command>
Expand Down
32 changes: 0 additions & 32 deletions platforms/xenon/Minecraft.sln

This file was deleted.

16 changes: 0 additions & 16 deletions platforms/xenon/projects/CustomProperties.props

This file was deleted.

Loading