mirror of
https://github.com/bdnugget/freeminer.git
synced 2026-11-07 06:57:27 +00:00
fix
This commit is contained in:
1 parent
aa383b97a8
commit
eca4f1f0ad
4 files changed
+14
-5
No files matched your search
File renamed without changes.
+2
-1
@@ -1065,6 +1065,7 @@ endif()
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
|
||||
else()
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}")
|
||||
endif()
|
||||
|
||||
# shared object target
|
||||
@@ -1567,7 +1568,7 @@ if(BUILD_CLIENT AND NOT ANDROID)
|
||||
BUNDLE DESTINATION .
|
||||
)
|
||||
if(UNIX)
|
||||
#CreateLegacyAlias(minetest_alias "${EXECUTABLE_OUTPUT_PATH}/minetest" ${PROJECT_NAME})
|
||||
CreateLegacyAlias(minetest_alias "${EXECUTABLE_OUTPUT_PATH}/minetest" ${PROJECT_NAME})
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
|
||||
@@ -1020,6 +1020,8 @@ bool isWorldAligned(AlignStyle style, WorldAlignMode mode, NodeDrawType drawtype
|
||||
|
||||
#endif
|
||||
|
||||
#if IS_CLIENT_BUILD
|
||||
|
||||
void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc,
|
||||
scene::IMeshManipulator *meshmanip, Client *client, const TextureSettings &tsettings
|
||||
, bool server
|
||||
@@ -1286,6 +1288,7 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
|
||||
/*
|
||||
NodeDefManager
|
||||
*/
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
+9
-4
@@ -27,10 +27,15 @@ class Client;
|
||||
//fm:
|
||||
#include "fm_bitset.h"
|
||||
#include <unordered_set>
|
||||
|
||||
|
||||
#include "msgpack_fix.h"
|
||||
|
||||
#if !CHECK_CLIENT_BUILD()
|
||||
namespace irr::scene
|
||||
{
|
||||
class IMeshManipulator;
|
||||
}
|
||||
#endif
|
||||
|
||||
enum {
|
||||
CONTENTFEATURES_NAME,
|
||||
CONTENTFEATURES_GROUPS,
|
||||
@@ -657,11 +662,11 @@ struct ContentFeatures
|
||||
return itemgroup_get(groups, group);
|
||||
}
|
||||
|
||||
#if CHECK_CLIENT_BUILD()
|
||||
//#if CHECK_CLIENT_BUILD()
|
||||
void updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc,
|
||||
scene::IMeshManipulator *meshmanip, Client *client, const TextureSettings &tsettings,
|
||||
bool server = false);
|
||||
#endif
|
||||
//#endif
|
||||
|
||||
private:
|
||||
void setAlphaFromLegacy(u8 legacy_alpha);
|
||||
|
||||
Reference in new issue
Block a user