Relintai/voxelman
1
0
Fork 0
mirror of https://github.com/Relintai/voxelman.git synced 2024-11-12 10:15:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile.

Browse Source
This commit is contained in:
Relintai 2020-04-03 09:32:34 +02:00
parent bf211fd430
commit 214323a9a0
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SCsub
View File

@ -47,9 +47,6 @@ sources = [
"thirdparty/lz4/lz4.c"
]
if env['tools']:
sources.append("prop_tool/prop_tool_editor_plugin.cpp")
if ARGUMENTS.get('custom_modules_shared', 'no') == 'yes':
# Shared lib compilation
module_env.Append(CCFLAGS=['-fPIC'])

2
library/voxelman_library.cpp
View File

@ -22,7 +22,7 @@ SOFTWARE.
#include "voxelman_library.h"
#include "../props/prop_data.h"
#include "../../props/props/prop_data.h"
//Materials
Ref<Material> VoxelmanLibrary::get_material(const int index) {

6
library/voxelman_library_merger.cpp
View File

@ -24,9 +24,9 @@ SOFTWARE.
#include "scene/resources/texture.h"
#include "../props/prop_data.h"
#include "../props/prop_data_mesh.h"
#include "../props/prop_data_prop.h"
#include "../../props/props/prop_data.h"
#include "../../props/props/prop_data_mesh.h"
#include "../../props/props/prop_data_prop.h"
int VoxelmanLibraryMerger::get_texture_flags() const {
return _packer->get_texture_flags();

1
register_types.cpp
View File

@ -84,7 +84,6 @@ void register_voxelman_types() {
#ifdef TOOLS_ENABLED
EditorPlugins::add_by_type<VoxelWorldEditorPlugin>();
EditorPlugins::add_by_type<PropToolEditorPlugin>();
#endif
}

10
world/voxel_chunk_default.h
View File

@ -53,11 +53,11 @@ SOFTWARE.
#include "../library/voxelman_library.h"
#include "../../mesh_data_resource/mesh_data_resource.h"
#include "../props/prop_data.h"
#include "../props/prop_data_entry.h"
#include "../props/prop_data_light.h"
#include "../props/prop_data_mesh.h"
#include "../props/prop_data_scene.h"
#include "../../props/props/prop_data.h"
#include "../../props/props/prop_data_entry.h"
#include "../../props/props/prop_data_light.h"
#include "../../props/props/prop_data_mesh.h"
#include "../../props/props/prop_data_scene.h"
#include "voxel_chunk_prop_data.h"
class VoxelWorld;