From 6e4540372bb862afb4fc084d5c5e68ba0ae9c67a Mon Sep 17 00:00:00 2001 From: realtradam Date: Tue, 3 Jan 2023 17:42:06 -0500 Subject: convert to library --- CMakeLists.txt | 11 +++++------ include/rodeo.h | 42 ++++++++++++++++++++++++++++++++++++++++++ run | 3 --- src/lib/lib.c | 6 ------ src/lib/lib.h | 3 --- src/main.c | 29 ----------------------------- src/rodeo.h | 42 ------------------------------------------ 7 files changed, 47 insertions(+), 89 deletions(-) create mode 100644 include/rodeo.h delete mode 100755 run delete mode 100644 src/lib/lib.c delete mode 100644 src/lib/lib.h delete mode 100644 src/main.c delete mode 100644 src/rodeo.h diff --git a/CMakeLists.txt b/CMakeLists.txt index fb32fbf..387d90c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,26 +1,24 @@ cmake_minimum_required(VERSION 3.25.1) include(ExternalProject) -project(space_squad) +project(RodeoEngine) file(GLOB SOURCES - "src/main.c" "src/rodeo.c" ) #add_library(lib src/lib.c) -add_executable(${PROJECT_NAME} ${SOURCES}) +add_library(${PROJECT_NAME} ${SOURCES}) add_subdirectory(external/SDL) ExternalProject_Add(project_bgfx #BUILD_IN_SOURCE true # this just doesn't work - SOURCE_DIR "external/bgfx" - BINARY_DIR "../external/bgfx" + SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/bgfx" + BINARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/bgfx" DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" - #BUILD_ALWAYS true BUILD_COMMAND make linux INSTALL_COMMAND "" ) @@ -30,6 +28,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC external/SDL/include PUBLIC external/bgfx/include PUBLIC external/bx/include + PUBLIC include ) target_link_directories(${PROJECT_NAME} diff --git a/include/rodeo.h b/include/rodeo.h new file mode 100644 index 0000000..e468c11 --- /dev/null +++ b/include/rodeo.h @@ -0,0 +1,42 @@ +#include +#include "SDL2/SDL.h" +#include "SDL2/SDL_syswm.h" + +typedef +struct +Rodeo__\ +Data_t +{ + SDL_Window* window; + SDL_Surface* screen_surface; + SDL_SysWMinfo wmi; + int screen_width; + int screen_height; + SDL_Event sdl_event; + bool quit; +} Rodeo__Data_t; + +void +Rodeo__\ +init_window( + Rodeo__Data_t* state, + int screen_height, + int screen_width, + char* title + ); + +void +Rodeo__\ +deinit_window(Rodeo__Data_t* state); + +void +Rodeo__\ +quit(); + +void +Rodeo__\ +begin(Rodeo__Data_t* state); + +void +Rodeo__\ +end(Rodeo__Data_t* state); diff --git a/run b/run deleted file mode 100755 index 95c0220..0000000 --- a/run +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -./build_dir/space_squad diff --git a/src/lib/lib.c b/src/lib/lib.c deleted file mode 100644 index 4de4456..0000000 --- a/src/lib/lib.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "lib.h" - -int add(int a, int b) -{ - return a + b; -} diff --git a/src/lib/lib.h b/src/lib/lib.h deleted file mode 100644 index 77a0e1e..0000000 --- a/src/lib/lib.h +++ /dev/null @@ -1,3 +0,0 @@ - -int -add(int a, int b); diff --git a/src/main.c b/src/main.c deleted file mode 100644 index 586d476..0000000 --- a/src/main.c +++ /dev/null @@ -1,29 +0,0 @@ -#include -#include -#include "SDL2/SDL.h" -#include "SDL2/SDL_syswm.h" -#include "bgfx/c99/bgfx.h" - -#include "rodeo.h" - -Rodeo__Data_t _state = {0}; -Rodeo__Data_t* state = &_state; - -int -main() -{ - Rodeo__init_window(state, 480, 640, "Rodeo Window"); - - while(!state->quit) - { - Rodeo__begin(state); - - bgfx_dbg_text_printf(0, 2, 0x6f, "Description: Initialization and debug text."); - - Rodeo__end(state); - } - - Rodeo__deinit_window(state); - Rodeo__quit(); - return 0; -} diff --git a/src/rodeo.h b/src/rodeo.h deleted file mode 100644 index e468c11..0000000 --- a/src/rodeo.h +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include "SDL2/SDL.h" -#include "SDL2/SDL_syswm.h" - -typedef -struct -Rodeo__\ -Data_t -{ - SDL_Window* window; - SDL_Surface* screen_surface; - SDL_SysWMinfo wmi; - int screen_width; - int screen_height; - SDL_Event sdl_event; - bool quit; -} Rodeo__Data_t; - -void -Rodeo__\ -init_window( - Rodeo__Data_t* state, - int screen_height, - int screen_width, - char* title - ); - -void -Rodeo__\ -deinit_window(Rodeo__Data_t* state); - -void -Rodeo__\ -quit(); - -void -Rodeo__\ -begin(Rodeo__Data_t* state); - -void -Rodeo__\ -end(Rodeo__Data_t* state); -- cgit v1.2.3