From 10ead34ff6a72c65f19572e27903b0cbce3bc335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Sun, 10 Jan 2021 17:52:20 +0100 Subject: [PATCH] client: fix win32 --- CMakeLists.txt | 4 ++-- code/apps/client/source/main.c | 1 - code/apps/client/source/renderer.c | 7 +++---- code/common/system.h | 1 + 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 code/common/system.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 77a0905..edd79f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,8 @@ project(eco2d) set(CMAKE_C_STANDARD 11) -include_directories(eco2d-client code/vendors) -include_directories(eco2d-server code/vendors) +include_directories(eco2d-client code/vendors code/common) +include_directories(eco2d-server code/vendors code/common) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/) add_subdirectory(code/apps/client) diff --git a/code/apps/client/source/main.c b/code/apps/client/source/main.c index 1511bba..41e358e 100644 --- a/code/apps/client/source/main.c +++ b/code/apps/client/source/main.c @@ -1,4 +1,3 @@ -#include "raylib.h" #include "game.h" int main(void) diff --git a/code/apps/client/source/renderer.c b/code/apps/client/source/renderer.c index bac0be1..1223536 100644 --- a/code/apps/client/source/renderer.c +++ b/code/apps/client/source/renderer.c @@ -1,9 +1,9 @@ +#include "system.h" #include "renderer.h" #include "raylib.h" -#include "zpl.h" -const zpl_u32 screenWidth = 800; -const zpl_u32 screenHeight = 450; +const uint16_t screenWidth = 800; +const uint16_t screenHeight = 450; void gfx_init() { InitWindow(screenWidth, screenHeight, "raylib [core] example - basic window"); @@ -14,7 +14,6 @@ void gfx_shutdown() { CloseWindow(); } - void gfx_render() { BeginDrawing(); ClearBackground(RAYWHITE); diff --git a/code/common/system.h b/code/common/system.h new file mode 100644 index 0000000..9a6118b --- /dev/null +++ b/code/common/system.h @@ -0,0 +1 @@ +#include