diff --git a/CMakeLists.txt b/CMakeLists.txt index 2727773..bbce022 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) project(games) -set(CMAKE_CXX_FLAGS "-std=c++17 -Wno-error") +set(CMAKE_CXX_FLAGS "-std=c++17 -Wno-error ") if(WIN32) set(PLATFORM_DIR "windows") else() diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index 49f0aed..08c46ce 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -5,7 +5,8 @@ add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/force_rebuild" COMMAND rm -f "${CMAKE_SOURCE_DIR}/link/libenginend.so" COMMAND rm -rf "${CMAKE_SOURCE_DIR}/include/enginend" ) -add_library(enginend SHARED ${ENGINE_SOURCES} "${CMAKE_BINARY_DIR}/force_rebuild") +add_library(enginend SHARED ${ENGINE_SOURCES} "${CMAKE_BINARY_DIR}/force_rebuild" + ../include/json.h) target_link_directories( enginend PUBLIC "${CMAKE_SOURCE_DIR}/link") @@ -48,9 +49,10 @@ target_link_libraries(test PRIVATE ) target_include_directories(test PUBLIC ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/lib/raylib/build/raylib/include + ${CMAKE_SOURCE_DIR}/lib/raylib/linux-64/raylib/include ) target_include_directories(enginend PUBLIC - ${CMAKE_SOURCE_DIR}/lib/raylib/build/raylib/include + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/lib/raylib/linux-64/raylib/include ) diff --git a/engine/src/scenes/scene.h b/engine/src/scenes/scene.h index 117f970..5647e2d 100644 --- a/engine/src/scenes/scene.h +++ b/engine/src/scenes/scene.h @@ -17,7 +17,7 @@ namespace enginend { } virtual void draw() { - ClearBackground(BLANK); + ClearBackground(rl::BLANK); BeginDrawing(); for (enginend::nodes::node* n : nodes) { n->draw(); diff --git a/games/endlauncher/CMakeLists.txt b/games/endlauncher/CMakeLists.txt index 94d3c8a..4919281 100644 --- a/games/endlauncher/CMakeLists.txt +++ b/games/endlauncher/CMakeLists.txt @@ -12,11 +12,11 @@ target_link_directories( "${CMAKE_SOURCE_DIR}/link") target_link_libraries(endlauncher PRIVATE "${CMAKE_SOURCE_DIR}/link/libenginend.so" - "${CMAKE_SOURCE_DIR}/link/libdesktopraylib.so" + "${CMAKE_SOURCE_DIR}/link/liblinux64raylib.so" curl zip ) target_include_directories(endlauncher PUBLIC ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/lib/raylib/build/raylib/include + ${CMAKE_SOURCE_DIR}/lib/raylib/linux-64/raylib/include ${CMAKE_SOURCE_DIR}/engine/include -) \ No newline at end of file +) diff --git a/games/endlauncher/src/main.cpp b/games/endlauncher/src/main.cpp index 3b5f24d..44e57a2 100644 --- a/games/endlauncher/src/main.cpp +++ b/games/endlauncher/src/main.cpp @@ -124,7 +124,7 @@ public: SetConfigFlags(FLAG_WINDOW_UNDECORATED|FLAG_WINDOW_TRANSPARENT|FLAG_WINDOW_TOPMOST); tiny::error("is transparent lol"); InitWindow(600,300,"test");target=LoadRenderTexture(600, 300); - img=GenImageColor(600, 300, BLANK); + img=GenImageColor(600, 300, rl::BLANK); SetTargetFPS(GetMonitorRefreshRate(GetCurrentMonitor())); this->tickrate=GetMonitorRefreshRate(GetCurrentMonitor()); bg=LoadTexture("res/launcher.png"); @@ -243,8 +243,8 @@ public: currentscene->draw(); EndTextureMode(); BeginDrawing(); - ClearBackground(BLANK); - DrawTexturePro(target.texture, {0, 0, 600, -300}, {0, 0, 600, 300}, {0, 0}, 0, WHITE); + ClearBackground(rl::BLANK); + DrawTexturePro(target.texture, {0, 0, 600, -300}, {0, 0, 600, 300}, {0, 0}, 0, rl::WHITE); EndDrawing(); Vector2 mp=Vector2(GetMousePositionDesktop()); Vector2 wp=GetWindowPosition(); diff --git a/lib/raylib b/lib/raylib index 5936a41..5e614e8 160000 --- a/lib/raylib +++ b/lib/raylib @@ -1 +1 @@ -Subproject commit 5936a41af9da7013b93d6e3c0cd48f07ea8d9782 +Subproject commit 5e614e814bf88c22a2f3795358513a700d3a77d0