diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b96e61..849d0c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) # set(CMAKE_VERBOSE_MAKEFILE ON) add_compile_options(-ggdb) -include_directories(external/include/) +include_directories( + external/include + shared/inc +) + link_libraries( ${CMAKE_SOURCE_DIR}/external/libimgui.a ${CMAKE_SOURCE_DIR}/external/libraylib.a @@ -18,50 +22,47 @@ link_libraries( m ) +add_library(shared STATIC + shared/src/canvas/BackGround.cpp + shared/src/canvas/BackGroundColors.cpp + shared/src/canvas/Canvas.cpp + shared/src/canvas/Tree.cpp + shared/src/values/Dna.cpp + shared/src/values/DnaManager.cpp + shared/src/values/mrand.cpp + shared/src/values/Similarity.cpp + shared/src/TcpSocket.cpp + shared/src/sql.cpp +) + add_executable(app app/src/main.cpp app/src/App.cpp app/src/DnaStore.cpp app/src/sys.cpp - shared/src/canvas/BackGround.cpp - shared/src/canvas/BackGroundColors.cpp - shared/src/canvas/Canvas.cpp - shared/src/canvas/Tree.cpp - shared/src/values/Dna.cpp - shared/src/values/DnaManager.cpp - shared/src/values/mrand.cpp - shared/src/values/Similarity.cpp - shared/src/TcpSocket.cpp ) -# Add include directories -target_include_directories(app PRIVATE app/inc shared/inc ) +target_include_directories(app PRIVATE app/inc) +target_link_libraries(app PRIVATE shared) add_executable(server server/src/server.cpp server/src/checker.cpp - shared/src/sql.cpp - shared/src/TcpSocket.cpp - shared/src/values/Dna.cpp - shared/src/values/DnaManager.cpp - shared/src/values/mrand.cpp ) -# Add include directories -target_include_directories(server PRIVATE server/inc shared/inc) +target_include_directories(server PRIVATE server/inc) +target_link_libraries(server PRIVATE shared) add_executable(view view/src/main.cpp view/src/Vapp.cpp - shared/src/canvas/BackGround.cpp - shared/src/canvas/BackGroundColors.cpp - shared/src/canvas/Canvas.cpp - shared/src/canvas/Tree.cpp - shared/src/values/Dna.cpp - shared/src/values/DnaManager.cpp - shared/src/values/mrand.cpp - shared/src/values/Similarity.cpp - - shared/src/sql.cpp ) -# Add include directories -target_include_directories(view PRIVATE view/inc shared/inc) \ No newline at end of file +target_include_directories(view PRIVATE view/inc) +target_link_libraries(view PRIVATE shared) + + +add_executable(testing + testing/src/main.cpp + testing/src/App.cpp +) +target_include_directories(testing PRIVATE testing/inc) +target_link_libraries(testing PRIVATE shared) \ No newline at end of file diff --git a/testing/inc/App.hpp b/testing/inc/App.hpp new file mode 100644 index 0000000..c24abf0 --- /dev/null +++ b/testing/inc/App.hpp @@ -0,0 +1,10 @@ + + +class App +{ +public: + void init(); + void update(); + void draw(); + void deinit(); +}; \ No newline at end of file diff --git a/testing/src/App.cpp b/testing/src/App.cpp new file mode 100644 index 0000000..2711268 --- /dev/null +++ b/testing/src/App.cpp @@ -0,0 +1,19 @@ +#include "App.hpp" +#include + +void App::init() +{ +} + +void App::update() +{ +} + +void App::draw() +{ + ClearBackground(RAYWHITE); +} + +void App::deinit() +{ +} diff --git a/testing/src/main.cpp b/testing/src/main.cpp new file mode 100644 index 0000000..25face7 --- /dev/null +++ b/testing/src/main.cpp @@ -0,0 +1,33 @@ +#include +#include +#include +#include "App.hpp" + +int main(int argc, char *argv[]) +{ + int screenWidth = 1000; + int screenHeight = 1000; + + App app; + SetConfigFlags(FLAG_WINDOW_RESIZABLE); + InitWindow(screenWidth, screenHeight, "Testing"); + SetTargetFPS(60); + rlImGuiSetup(true); + app.init(); + ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_DockingEnable; + + while (!WindowShouldClose()) + { + app.update(); + BeginDrawing(); + rlImGuiBegin(); + app.draw(); + + rlImGuiEnd(); + EndDrawing(); + } + app.deinit(); + rlImGuiShutdown(); + CloseWindow(); + return 0; +} \ No newline at end of file