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

Compiling for RG351M successfully.

Browse Source
This commit is contained in:
Dominic Masters
2021-08-27 12:29:51 -07:00
parent c07edc8770
commit 23c0bdaba6
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -26,7 +26,7 @@ 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_WIN32) set(SETTING_TARGET SETTING_TARGET_RG351)
# Win32 # Win32
if(${SETTING_TARGET} EQUAL ${SETTING_TARGET_WIN32}) if(${SETTING_TARGET} EQUAL ${SETTING_TARGET_WIN32})
@ -129,7 +129,10 @@ target_link_libraries(${PROJECT_NAME} cglm)
# OpenGL # OpenGL
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
target_link_libraries(${PROJECT_NAME} OpenGL::GL) target_link_libraries(${PROJECT_NAME} OpenGL::OpenGL)
message(WARNING ${OpenGL_OpenGL_FOUND})
# CMake # CMake
target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS}) target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS})

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

@ -7,7 +7,7 @@
#include "../libs.h" #include "../libs.h"
/** Prefix of all asset load methods, may be customizable in future. */ /** Prefix of all asset load methods, may be customizable in future. */
#define ASSET_PREFIX "../assets/" #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;

2
src/file/asset.c
View File

@ -45,6 +45,8 @@ assetbuffer_t * assetBufferOpen(char *assetName) {
strcat(joined, ASSET_PREFIX);//Add prefix strcat(joined, ASSET_PREFIX);//Add prefix
strcat(joined, assetName);//Add body strcat(joined, assetName);//Add body
printf("Opening up %s\n", joined);
// Open the file pointer now. // Open the file pointer now.
FILE *fptr = fopen(joined, "rb"); FILE *fptr = fopen(joined, "rb");
free(joined);// Free the string we just created free(joined);// Free the string we just created

2
src/game/poker/pokergameassets.c
View File

@ -20,7 +20,7 @@ bool pokerGameAssetsInit(pokergameassets_t *assets) {
// Load the world textures. // Load the world textures.
assetTextureLoad(&assets->testTexture, "test_texture.png"); assetTextureLoad(&assets->testTexture, "test_texture.png");
assetTextureLoad(&assets->roomTexture, "world/pub/pub_skywall.png"); assetTextureLoad(&assets->roomTexture, "world/pub/pub_skywall_low.png");
// Load the character textures. // Load the character textures.
assetTextureLoad(&assets->pennyTexture, "characters/penny/sprites/sheet.png"); assetTextureLoad(&assets->pennyTexture, "characters/penny/sprites/sheet.png");