Fixed double dash
This commit is contained in:
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@ -23,7 +23,7 @@ jobs:
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
cmake -B build --DTARGET_TYPE=test
|
||||
cmake -B build -DTARGET_TYPE=test
|
||||
cmake --build ./build
|
||||
|
||||
- name: Test
|
||||
|
@ -53,6 +53,11 @@ elseif(TARGET_TYPE STREQUAL game)
|
||||
shared/fonts/opensans/OpenSans-Bold.ttf fonts/opensans/OpenSans-Bold.ttf
|
||||
)
|
||||
|
||||
# Textures
|
||||
tool_copy(texture_test
|
||||
shared/textures/test_texture.png textures/test_texture.png
|
||||
)
|
||||
|
||||
# Poker Game
|
||||
if(TARGET_GAME STREQUAL poker)
|
||||
add_compile_definitions(
|
||||
@ -82,6 +87,7 @@ elseif(TARGET_TYPE STREQUAL game)
|
||||
tool_assets(
|
||||
shader_textured
|
||||
font_opensans
|
||||
texture_test
|
||||
vn_penny
|
||||
vn_lucy
|
||||
vn_julie
|
||||
|
@ -9,17 +9,17 @@
|
||||
bool pokerGameAssetsInit(pokergameassets_t *assets) {
|
||||
// Load the game's shader
|
||||
assetShaderLoad(&assets->shader,
|
||||
"shared/shaders/textured.vert", "shared/shaders/textured.frag"
|
||||
"shaders/textured.vert", "shaders/textured.frag"
|
||||
);
|
||||
|
||||
// Load the game's font
|
||||
assetFontLoad(&assets->font, "shared/fonts/opensans/OpenSans-Bold.ttf");
|
||||
assetFontLoad(&assets->font, "fonts/opensans/OpenSans-Bold.ttf");
|
||||
|
||||
// Initialize the language buffer.
|
||||
languageInit(&assets->language, "locale/language/en-US.csv");
|
||||
|
||||
// Load the world textures.
|
||||
assetTextureLoad(&assets->testTexture, "shared/test_texture.png");
|
||||
assetTextureLoad(&assets->testTexture, "textures/test_texture.png");
|
||||
assetTextureLoad(&assets->cardTexture, "poker/cards_normal.png");
|
||||
assetTextureLoad(&assets->roomTexture, "poker/world/pub/pub_skywall.png");
|
||||
|
||||
|
Reference in New Issue
Block a user