move imgui to submodule, and cleanup repo
This commit is contained in:
parent
c3f5cde460
commit
c7e7f43d1d
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -1 +1,3 @@
|
||||||
b
|
b/
|
||||||
|
imgui.ini
|
||||||
|
compile_commands.json
|
||||||
|
|
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,3 +1,6 @@
|
||||||
[submodule "vendor/compilecommands"]
|
[submodule "vendor/compilecommands"]
|
||||||
path = vendor/compilecommands
|
path = vendor/compilecommands
|
||||||
url = https://github.com/danielbarter/mini_compile_commands
|
url = https://github.com/danielbarter/mini_compile_commands
|
||||||
|
[submodule "vendor/imgui"]
|
||||||
|
path = vendor/imgui
|
||||||
|
url = https://github.com/ocornut/imgui
|
||||||
|
|
8
.idea/.gitignore
vendored
8
.idea/.gitignore
vendored
|
@ -1,8 +0,0 @@
|
||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
# Editor-based HTTP Client requests
|
|
||||||
/httpRequests/
|
|
||||||
# Datasource local storage ignored files
|
|
||||||
/dataSources/
|
|
||||||
/dataSources.local.xml
|
|
|
@ -1,17 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="DiscordProjectSettings">
|
|
||||||
<option name="show" value="ASK" />
|
|
||||||
<option name="description" value="" />
|
|
||||||
</component>
|
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
|
||||||
<component name="MakefileSettings">
|
|
||||||
<option name="linkedExternalProjectsSettings">
|
|
||||||
<MakefileProjectSettings>
|
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
|
||||||
<option name="version" value="2" />
|
|
||||||
</MakefileProjectSettings>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="MakefileWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
|
|
||||||
</project>
|
|
10
.vscode/settings.json
vendored
10
.vscode/settings.json
vendored
|
@ -1,10 +0,0 @@
|
||||||
{
|
|
||||||
"Lua.runtime.version": "LuaJIT",
|
|
||||||
"Lua.runtime.special": {
|
|
||||||
"love.filesystem.load": "loadfile"
|
|
||||||
},
|
|
||||||
"Lua.workspace.library": [
|
|
||||||
"${3rd}/love2d/library",
|
|
||||||
"/home/interfiber/.vscode/extensions/sumneko.lua-3.6.20-linux-x64/server/meta/423b747a"
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -8,10 +8,10 @@ find_package(SDL2_image REQUIRED)
|
||||||
include_directories(${SDL2_INCLUDE_DIRS})
|
include_directories(${SDL2_INCLUDE_DIRS})
|
||||||
include_directories(${SDL2_image_INCLUDE_DIRS})
|
include_directories(${SDL2_image_INCLUDE_DIRS})
|
||||||
include_directories("include")
|
include_directories("include")
|
||||||
include_directories("imgui")
|
include_directories("vendor/imgui")
|
||||||
include_directories("imgui/backends")
|
include_directories("vendor/imgui/backends")
|
||||||
|
|
||||||
file(GLOB_RECURSE source_files "src/*.cpp" "src/*.hpp")
|
file(GLOB_RECURSE source_files "src/*.cpp" "src/*.hpp")
|
||||||
|
|
||||||
add_executable(PhoenixGame ${source_files} imgui/imgui.cpp imgui/imgui_draw.cpp imgui/imgui_widgets.cpp imgui/imgui_demo.cpp imgui/imgui_tables.cpp imgui/backends/imgui_impl_sdl2.cpp imgui/backends/imgui_impl_sdlrenderer.cpp imgui/misc/cpp/imgui_stdlib.cpp)
|
add_executable(PhoenixGame ${source_files} vendor/imgui/imgui.cpp vendor/imgui/imgui_draw.cpp vendor/imgui/imgui_widgets.cpp vendor/imgui/imgui_demo.cpp vendor/imgui/imgui_tables.cpp vendor/imgui/backends/imgui_impl_sdl2.cpp vendor/imgui/backends/imgui_impl_sdlrenderer.cpp vendor/imgui/misc/cpp/imgui_stdlib.cpp)
|
||||||
target_link_libraries(PhoenixGame ${SDL2_LIBRARIES} SDL2_image)
|
target_link_libraries(PhoenixGame ${SDL2_LIBRARIES} SDL2_image)
|
||||||
|
|
|
@ -4,7 +4,7 @@ Size=400,400
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][Phoenix Map Editor]
|
[Window][Phoenix Map Editor]
|
||||||
Pos=1347,1144
|
Pos=852,577
|
||||||
Size=521,71
|
Size=521,71
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
|
|
0
imgui → vendor/imgui
vendored
0
imgui → vendor/imgui
vendored
Loading…
Reference in a new issue