YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added additional settings to control assets prefix.

Browse Source
This commit is contained in:
Dominic Masters
2021-08-27 20:30:53 -07:00
parent 23c0bdaba6
commit 01c26b9e16
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -26,18 +26,20 @@ set(SETTING_GAME_NAME "DawnGame")
set(SETTING_TARGET_WIN32 1) set(SETTING_TARGET_WIN32 1)
set(SETTING_TARGET_RG351 2) set(SETTING_TARGET_RG351 2)
set(SETTING_TARGET SETTING_TARGET_RG351) set(SETTING_TARGET SETTING_TARGET_WIN32)
# Win32 # Win32
if(${SETTING_TARGET} EQUAL ${SETTING_TARGET_WIN32}) if(${SETTING_TARGET} EQUAL ${SETTING_TARGET_WIN32})
set(SETTING_PLATFORM SETTING_PLATFORM_GLFW) set(SETTING_PLATFORM SETTING_PLATFORM_GLFW)
set(SETTING_PLATFORM_USE_GLAD 1) set(SETTING_PLATFORM_USE_GLAD 1)
set(SETTING_ASSET_PREFIX "../assets/")
endif() endif()
# RG351 # RG351
if(${SETTING_TARGET} EQUAL ${SETTING_TARGET_RG351}) if(${SETTING_TARGET} EQUAL ${SETTING_TARGET_RG351})
set(SETTING_PLATFORM SETTING_PLATFORM_SDL) set(SETTING_PLATFORM SETTING_PLATFORM_SDL)
set(SETTING_PLATFORM_USE_GLAD 1) set(SETTING_PLATFORM_USE_GLAD 1)
set(SETTING_ASSET_PREFIX "assets/")
endif() endif()
# Configuring # Configuring
@ -129,9 +131,12 @@ target_link_libraries(${PROJECT_NAME} cglm)
# OpenGL # OpenGL
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
target_link_libraries(${PROJECT_NAME} OpenGL::OpenGL)
message(WARNING ${OpenGL_OpenGL_FOUND}) if(${SETTING_TARGET} EQUAL ${SETTING_TARGET_RG351})
target_link_libraries(${PROJECT_NAME} OpenGL::OpenGL)
else()
target_link_libraries(${PROJECT_NAME} OpenGL::GL)
endif()
# CMake # CMake

3
config.h.in
View File

@ -19,6 +19,9 @@
#cmakedefine SETTING_PLATFORM_USE_GLAD @SETTING_PLATFORM_USE_GLAD@ #cmakedefine SETTING_PLATFORM_USE_GLAD @SETTING_PLATFORM_USE_GLAD@
// Additional settings
#cmakedefine SETTING_ASSET_PREFIX "@SETTING_ASSET_PREFIX@"
// Game Settings // Game Settings
#cmakedefine SETTING_GAME_POKER @SETTING_GAME_POKER@ #cmakedefine SETTING_GAME_POKER @SETTING_GAME_POKER@
#cmakedefine SETTING_GAME_DAWN @SETTING_GAME_DAWN@ #cmakedefine SETTING_GAME_DAWN @SETTING_GAME_DAWN@

3
include/dawn/file/asset.h
View File

@ -6,8 +6,5 @@
#pragma once #pragma once
#include "../libs.h" #include "../libs.h"
/** Prefix of all asset load methods, may be customizable in future. */
#define ASSET_PREFIX "assets/"
/** Definition of an asset ready to be buffered */ /** Definition of an asset ready to be buffered */
typedef FILE assetbuffer_t; typedef FILE assetbuffer_t;

4
src/file/asset.c
View File

@ -35,14 +35,14 @@ char * assetStringLoad(char *assetName) {
assetbuffer_t * assetBufferOpen(char *assetName) { assetbuffer_t * assetBufferOpen(char *assetName) {
// Get the directory based on the raw input by creating a new string. // Get the directory based on the raw input by creating a new string.
size_t lenAsset = strlen(assetName);// Get the length of asset size_t lenAsset = strlen(assetName);// Get the length of asset
size_t lenPrefix = strlen(ASSET_PREFIX);// Get the length of the prefix size_t lenPrefix = strlen(SETTING_ASSET_PREFIX);// Get the length of the prefix
// Create str to house both the prefix and asset, and null terminator // Create str to house both the prefix and asset, and null terminator
char *joined = malloc(lenAsset + lenPrefix + 1); char *joined = malloc(lenAsset + lenPrefix + 1);
if(joined == NULL) return NULL;// Mem okay? if(joined == NULL) return NULL;// Mem okay?
joined[0] = '\0';//Start at null joined[0] = '\0';//Start at null
strcat(joined, ASSET_PREFIX);//Add prefix strcat(joined, SETTING_ASSET_PREFIX);//Add prefix
strcat(joined, assetName);//Add body strcat(joined, assetName);//Add body
printf("Opening up %s\n", joined); printf("Opening up %s\n", joined);