Compare commits

...

6 Commits

Author SHA1 Message Date
illyum
440fd87ccc chore(cmake): add enet header to projects 2024-08-30 11:50:01 -06:00
illyum
f759fd3302 feat(build): test enet links correctly 2024-08-30 11:48:34 -06:00
illyum
59bdc552e3 chore(cmake): add enet header file 2024-08-30 11:47:45 -06:00
illyum
579bca1940 chore(.gitignore): remove script output files 2024-08-30 11:21:52 -06:00
illyum
64f7bad682 chore(cleanup): remove manually added enet library header 2024-08-30 11:20:15 -06:00
illyum
d417b147ed feat(build): use CMake to fetch and link enet library 2024-08-30 11:19:59 -06:00
9 changed files with 48 additions and 6096 deletions

5
.gitignore vendored
View File

@ -18,4 +18,7 @@ venv/
typer.py
# Cache Files
.cache/
.cache/
# Script output files
output.txt

View File

@ -4,6 +4,13 @@ project(FarmFighter)
set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif()
set(FETCHCONTENT_QUIET OFF)
include(FetchContent)
FetchContent_Declare(
raylib
@ -15,6 +22,15 @@ FetchContent_MakeAvailable(raylib)
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
set(BUILD_GAMES OFF CACHE BOOL "" FORCE)
FetchContent_Declare(
enet
URL https://github.com/zpl-c/enet/archive/refs/tags/v2.3.10.zip
)
FetchContent_MakeAvailable(enet)
add_library(enet INTERFACE)
target_include_directories(enet INTERFACE ${enet_SOURCE_DIR}/include)
add_subdirectory(networking)
add_subdirectory(engine)
add_subdirectory(client)

View File

@ -22,7 +22,6 @@ add_library(ImGui STATIC
)
target_include_directories(ImGui PUBLIC ${imgui_SOURCE_DIR})
# rlImGui
FetchContent_Declare(
rlImGui
GIT_REPOSITORY https://github.com/raylib-extras/rlImGui.git
@ -46,8 +45,10 @@ target_include_directories(client PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../networking/include
${CMAKE_CURRENT_SOURCE_DIR}/../engine/include
${enet_SOURCE_DIR}/include
)
target_link_libraries(client raylib networking engine rlImGui ImGui)
target_link_libraries(client raylib networking engine rlImGui ImGui enet)
if (WIN32)
target_link_libraries(client ws2_32)

View File

@ -1,6 +1,13 @@
#include <stdio.h>
#define ENET_IMPLEMENTATION
#include <enet.h>
int main() {
printf("This is the farm fighter client!\n");
return 0;
if (enet_initialize() != 0) {
printf("Error init enet\n");
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}

View File

@ -7,6 +7,7 @@ add_library(engine STATIC
target_include_directories(engine PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/include
${raylib_SOURCE_DIR}/src
${enet_SOURCE_DIR}/include
)
target_include_directories(engine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)

View File

@ -7,6 +7,9 @@ add_library(networking STATIC
target_include_directories(networking PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/include
${raylib_SOURCE_DIR}/src
${enet_SOURCE_DIR}/include
)
target_include_directories(networking PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_include_directories(networking PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_link_libraries(networking enet)

File diff suppressed because it is too large Load Diff

View File

@ -8,10 +8,11 @@ target_include_directories(server PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../networking/include
${CMAKE_CURRENT_SOURCE_DIR}/../engine/include
${enet_SOURCE_DIR}/include
)
target_link_libraries(server networking engine raylib)
target_link_libraries(server networking engine raylib enet)
if (WIN32)
target_link_libraries(server ws2_32)
endif()
endif()

View File

@ -1,8 +1,16 @@
#include <stdio.h>
#define ENET_IMPLEMENTATION
#include <enet.h>
int main() {
printf("Server starting...\n");
if (enet_initialize() != 0) {
printf("Error init enet\n");
return EXIT_FAILURE;
}
printf("Press any key to exit...\n");
scanf_s("0");
return 0;
return EXIT_SUCCESS;
}