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.

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 sokol #27

Merged
merged 6 commits into from
Jul 18, 2024
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
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "contrib/imgui"]
path = contrib/imgui
url = https://github.com/ocornut/imgui.git
[submodule "contrib/assimp"]
path = contrib/assimp
url = https://github.com/assimp/assimp.git
[submodule "contrib/osre"]
path = contrib/osre
url = https://github.com/kimkulling/osre.git
42 changes: 7 additions & 35 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,60 +10,32 @@ set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin )

add_subdirectory(contrib/assimp)
add_subdirectory(contrib/osre)

INCLUDE_DIRECTORIES( BEFORE
${PROJECT_SOURCE_DIR}/contrib/imgui
${PROJECT_SOURCE_DIR}/contrib/assimp/include
./
./src
${SDL2_INCLUDE_DIRS}
src
contrib/osre/src/Engine
contrib/osre/contrib/cppcore/include
${SDL2_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}
)

link_directories(
${SDL2_LIBRARIES}
)

set(assimpview_platform_backend
contrib/imgui/backends/imgui_impl_sdl2.cpp
contrib/imgui/backends/imgui_impl_sdl2.h
contrib/imgui/backends/imgui_impl_opengl3.cpp
contrib/imgui/backends/imgui_impl_opengl3.h
)

set(assimpview_imgui_src
contrib/imgui/imconfig.h
contrib/imgui/imgui.cpp
contrib/imgui/imgui.h
contrib/imgui/imgui_demo.cpp
contrib/imgui/imgui_draw.cpp
contrib/imgui/imgui_internal.h
contrib/imgui/imgui_tables.cpp
contrib/imgui/imgui_widgets.cpp
contrib/imgui/imstb_rectpack.h
contrib/imgui/imstb_textedit.h
contrib/imgui/imstb_truetype.h
${assimpview_platform_backend}
)

set(assimpview_main_src
src/MainRenderView.cpp
src/MainRenderView.h
src/AssimpViewerApp.cpp
src/AssimpViewerApp.h
src/ModelLoading.cpp
src/SceneData.h
src/main.cpp
)

SOURCE_GROUP(ImGui\\ FILES ${assimpview_imgui_src})
SOURCE_GROUP(Main\\ FILES ${assimpview_main_src})

ADD_EXECUTABLE( assimp_view
${assimpview_imgui_src}
${assimpview_main_src}
)

target_link_libraries(assimp_view
PRIVATE SDL2::SDL2 assimp GL
PRIVATE SDL2::SDL2 assimp GL osre
)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ First, you have to check out the code

Now change into the repo folder and start the build:

> cd osre
> cd assimp_view
> cmake CMakeLists.txt
> cmake --build .

Expand Down
1 change: 0 additions & 1 deletion contrib/imgui
Submodule imgui deleted from 9ec299
1 change: 1 addition & 0 deletions contrib/osre
Submodule osre added at d9d7a0
11,133 changes: 0 additions & 11,133 deletions contrib/sokol/sokol_app.h

This file was deleted.

Loading
Loading