Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove "src/engine" from include directories #821

Merged
merged 6 commits into from
Apr 22, 2016
Merged

Remove "src/engine" from include directories #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
135dfb3
change includes use engine/* directories in engine
MAnyKey Apr 22, 2016
88a871b
change includes to "engine/core" directory
MAnyKey Apr 22, 2016
6467fe5
change includes to "engine/universe" directory
MAnyKey Apr 22, 2016
ab5e2ab
change includes to "engine/debug" directory
MAnyKey Apr 22, 2016
9e0b12b
change includes to individual files in engine/ directory
MAnyKey Apr 22, 2016
e4a926e
remove "../src/engine" from includedirs in genie.lua
MAnyKey Apr 22, 2016
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
4 changes: 2 additions & 2 deletions projects/genie.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ solution "LumixEngine"
configurations { "Debug", "Release", "RelWithDebInfo" }
platforms { "x32", "x64" }
flags { "FatalWarnings", "NoPCH" }
includedirs {"../src", "../src/engine"}
includedirs {"../src"}
location(LOCATION)
language "C++"
startproject "studio"
Expand Down Expand Up @@ -396,4 +396,4 @@ project "studio"
links { "editor" }

useLua()
defaultConfigurations()
defaultConfigurations()
14 changes: 7 additions & 7 deletions src/animation/animation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "animation/animation.h"
#include "core/fs/file_system.h"
#include "core/log.h"
#include "core/matrix.h"
#include "core/profiler.h"
#include "core/quat.h"
#include "core/resource_manager.h"
#include "core/vec.h"
#include "engine/core/fs/file_system.h"
#include "engine/core/log.h"
#include "engine/core/matrix.h"
#include "engine/core/profiler.h"
#include "engine/core/quat.h"
#include "engine/core/resource_manager.h"
#include "engine/core/vec.h"
#include "renderer/model.h"
#include "renderer/pose.h"

Expand Down
4 changes: 2 additions & 2 deletions src/animation/animation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "core/resource.h"
#include "core/resource_manager_base.h"
#include "engine/core/resource.h"
#include "engine/core/resource_manager_base.h"

namespace Lumix
{
Expand Down
16 changes: 8 additions & 8 deletions src/animation/animation_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#include "animation_system.h"
#include "animation/animation.h"
#include "core/base_proxy_allocator.h"
#include "core/blob.h"
#include "core/crc32.h"
#include "core/json_serializer.h"
#include "core/profiler.h"
#include "core/resource_manager.h"
#include "engine/core/base_proxy_allocator.h"
#include "engine/core/blob.h"
#include "engine/core/crc32.h"
#include "engine/core/json_serializer.h"
#include "engine/core/profiler.h"
#include "engine/core/resource_manager.h"
#include "editor/asset_browser.h"
#include "editor/imgui/imgui.h"
#include "editor/property_grid.h"
#include "editor/studio_app.h"
#include "editor/world_editor.h"
#include "engine.h"
#include "engine/engine.h"
#include "engine/property_descriptor.h"
#include "engine/property_register.h"
#include "renderer/model.h"
#include "renderer/pose.h"
#include "renderer/render_scene.h"
#include "universe/universe.h"
#include "engine/universe/universe.h"


namespace Lumix
Expand Down
4 changes: 2 additions & 2 deletions src/animation/animation_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once


#include "lumix.h"
#include "iplugin.h"
#include "engine/lumix.h"
#include "engine/iplugin.h"


namespace Lumix
Expand Down
40 changes: 20 additions & 20 deletions src/app/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
#include "core/blob.h"
#include "core/command_line_parser.h"
#include "core/crc32.h"
#include "core/fs/disk_file_device.h"
#include "core/fs/file_system.h"
#include "core/fs/file_system.h"
#include "core/fs/memory_file_device.h"
#include "core/fs/pack_file_device.h"
#include "core/input_system.h"
#include "core/log.h"
#include "core/lua_wrapper.h"
#include "core/mt/thread.h"
#include "core/path_utils.h"
#include "core/profiler.h"
#include "core/resource_manager.h"
#include "core/resource_manager_base.h"
#include "core/system.h"
#include "core/timer.h"
#include "debug/debug.h"
#include "engine/core/blob.h"
#include "engine/core/command_line_parser.h"
#include "engine/core/crc32.h"
#include "engine/core/fs/disk_file_device.h"
#include "engine/core/fs/file_system.h"
#include "engine/core/fs/file_system.h"
#include "engine/core/fs/memory_file_device.h"
#include "engine/core/fs/pack_file_device.h"
#include "engine/core/input_system.h"
#include "engine/core/log.h"
#include "engine/core/lua_wrapper.h"
#include "engine/core/mt/thread.h"
#include "engine/core/path_utils.h"
#include "engine/core/profiler.h"
#include "engine/core/resource_manager.h"
#include "engine/core/resource_manager_base.h"
#include "engine/core/system.h"
#include "engine/core/timer.h"
#include "engine/debug/debug.h"
#include "editor/gizmo.h"
#include "editor/world_editor.h"
#include "engine/engine.h"
#include "engine/plugin_manager.h"
#include "renderer/pipeline.h"
#include "renderer/renderer.h"
#include "renderer/texture.h"
#include "universe/universe.h"
#include "engine/universe/universe.h"
#include <cstdio>
#include <windows.h>

Expand Down
2 changes: 1 addition & 1 deletion src/audio/audio_device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once


#include "lumix.h"
#include "engine/lumix.h"


namespace Lumix
Expand Down
16 changes: 8 additions & 8 deletions src/audio/audio_scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
#include "audio_device.h"
#include "audio_system.h"
#include "clip_manager.h"
#include "core/blob.h"
#include "core/crc32.h"
#include "core/iallocator.h"
#include "core/lua_wrapper.h"
#include "core/matrix.h"
#include "core/resource_manager.h"
#include "core/resource_manager_base.h"
#include "engine/core/blob.h"
#include "engine/core/crc32.h"
#include "engine/core/iallocator.h"
#include "engine/core/lua_wrapper.h"
#include "engine/core/matrix.h"
#include "engine/core/resource_manager.h"
#include "engine/core/resource_manager_base.h"
#include "editor/world_editor.h"
#include "engine/engine.h"
#include "lua_script/lua_script_system.h"
#include "universe/universe.h"
#include "engine/universe/universe.h"


namespace Lumix
Expand Down
6 changes: 3 additions & 3 deletions src/audio/audio_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#include "audio_device.h"
#include "audio_scene.h"
#include "clip_manager.h"
#include "core/crc32.h"
#include "core/path.h"
#include "core/resource_manager.h"
#include "engine/core/crc32.h"
#include "engine/core/path.h"
#include "engine/core/resource_manager.h"
#include "editor/asset_browser.h"
#include "editor/imgui/imgui.h"
#include "editor/studio_app.h"
Expand Down
8 changes: 4 additions & 4 deletions src/audio/clip_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "clip_manager.h"
#include "core/iallocator.h"
#include "core/resource.h"
#include "core/string.h"
#include "lumix.h"
#include "engine/core/iallocator.h"
#include "engine/core/resource.h"
#include "engine/core/string.h"
#include "engine/lumix.h"
#define STB_VORBIS_HEADER_ONLY
#include "stb_vorbis.c"
#include <cstdlib>
Expand Down
6 changes: 3 additions & 3 deletions src/audio/clip_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once


#include "core/array.h"
#include "core/resource.h"
#include "core/resource_manager_base.h"
#include "engine/core/array.h"
#include "engine/core/resource.h"
#include "engine/core/resource_manager_base.h"


namespace Lumix
Expand Down
2 changes: 1 addition & 1 deletion src/audio/pc/audio_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "audio_device.h"
#include "clip_manager.h"
#include "core/log.h"
#include "engine/core/log.h"
#include "engine/engine.h"
#include "engine/iplugin.h"
#include <dsound.h>
Expand Down
18 changes: 9 additions & 9 deletions src/editor/asset_browser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#include "asset_browser.h"
#include "core/crc32.h"
#include "core/fs/disk_file_device.h"
#include "core/log.h"
#include "core/path_utils.h"
#include "core/profiler.h"
#include "core/resource.h"
#include "core/resource_manager.h"
#include "core/resource_manager_base.h"
#include "core/string.h"
#include "engine/core/crc32.h"
#include "engine/core/fs/disk_file_device.h"
#include "engine/core/log.h"
#include "engine/core/path_utils.h"
#include "engine/core/profiler.h"
#include "engine/core/resource.h"
#include "engine/core/resource_manager.h"
#include "engine/core/resource_manager_base.h"
#include "engine/core/string.h"
#include "editor/world_editor.h"
#include "engine/engine.h"
#include "file_system_watcher.h"
Expand Down
8 changes: 4 additions & 4 deletions src/editor/asset_browser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once


#include "core/array.h"
#include "core/delegate_list.h"
#include "core/path.h"
#include "core/mt/sync.h"
#include "engine/core/array.h"
#include "engine/core/delegate_list.h"
#include "engine/core/path.h"
#include "engine/core/mt/sync.h"


namespace Lumix
Expand Down
14 changes: 7 additions & 7 deletions src/editor/editor_icon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include "editor_icon.h"
#include "core/crc32.h"
#include "core/math_utils.h"
#include "core/matrix.h"
#include "core/resource_manager.h"
#include "core/resource_manager_base.h"
#include "engine.h"
#include "engine/core/crc32.h"
#include "engine/core/math_utils.h"
#include "engine/core/matrix.h"
#include "engine/core/resource_manager.h"
#include "engine/core/resource_manager_base.h"
#include "engine/engine.h"
#include "render_interface.h"
#include "universe/universe.h"
#include "engine/universe/universe.h"
#include "world_editor.h"
#include <cmath>

Expand Down
2 changes: 1 addition & 1 deletion src/editor/editor_icon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once


#include "core/matrix.h"
#include "engine/core/matrix.h"


namespace Lumix
Expand Down
6 changes: 3 additions & 3 deletions src/editor/entity_groups.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "entity_groups.h"
#include "core/blob.h"
#include "core/string.h"
#include "universe/universe.h"
#include "engine/core/blob.h"
#include "engine/core/string.h"
#include "engine/universe/universe.h"


namespace Lumix
Expand Down
4 changes: 2 additions & 2 deletions src/editor/entity_groups.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once


#include "lumix.h"
#include "core/array.h"
#include "engine/lumix.h"
#include "engine/core/array.h"


namespace Lumix
Expand Down
18 changes: 9 additions & 9 deletions src/editor/entity_template_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#include "entity_template_system.h"
#include "core/array.h"
#include "core/blob.h"
#include "core/crc32.h"
#include "core/json_serializer.h"
#include "core/math_utils.h"
#include "core/string.h"
#include "engine/core/array.h"
#include "engine/core/blob.h"
#include "engine/core/crc32.h"
#include "engine/core/json_serializer.h"
#include "engine/core/math_utils.h"
#include "engine/core/string.h"
#include "editor/ieditor_command.h"
#include "editor/world_editor.h"
#include "engine.h"
#include "iplugin.h"
#include "universe/universe.h"
#include "engine/engine.h"
#include "engine/iplugin.h"
#include "engine/universe/universe.h"
#include <cstdlib>


Expand Down
6 changes: 3 additions & 3 deletions src/editor/entity_template_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once


#include "lumix.h"
#include "core/delegate_list.h"
#include "core/string.h"
#include "engine/lumix.h"
#include "engine/core/delegate_list.h"
#include "engine/core/string.h"


namespace Lumix
Expand Down
4 changes: 2 additions & 2 deletions src/editor/file_system_watcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "core/delegate.h"
#include "core/path.h"
#include "engine/core/delegate.h"
#include "engine/core/path.h"


class LUMIX_EDITOR_API FileSystemWatcher
Expand Down
16 changes: 8 additions & 8 deletions src/editor/gizmo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#include "core/crc32.h"
#include "core/math_utils.h"
#include "core/matrix.h"
#include "core/quat.h"
#include "core/resource_manager.h"
#include "core/resource_manager_base.h"
#include "engine/core/crc32.h"
#include "engine/core/math_utils.h"
#include "engine/core/matrix.h"
#include "engine/core/quat.h"
#include "engine/core/resource_manager.h"
#include "engine/core/resource_manager_base.h"
#include "editor/gizmo.h"
#include "editor/world_editor.h"
#include "engine.h"
#include "engine/engine.h"
#include "render_interface.h"
#include "renderer/render_scene.h"
#include "universe/universe.h"
#include "engine/universe/universe.h"
#include <cfloat>
#include <cmath>

Expand Down
2 changes: 1 addition & 1 deletion src/editor/gizmo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once


#include "lumix.h"
#include "engine/lumix.h"


namespace Lumix
Expand Down
2 changes: 1 addition & 1 deletion src/editor/imgui/imgui_dock.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "imgui.h"
#define IMGUI_DEFINE_PLACEMENT_NEW
#include "imgui_internal.h"
#include "core/fs/os_file.h"
#include "engine/core/fs/os_file.h"
#include <lua.hpp>


Expand Down
Loading