Skip to content

Commit 63f8b13

Browse files
committed
Fixed windows build steps
1 parent e121f01 commit 63f8b13

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

examples/game/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ game-assets:
6666
# Copy assets (and other required build files) directory to the build directory
6767
render-assets:
6868
$(MKDIR) $(call platformpth,$(exampleGameBuildDir))
69-
$(call COPY_DIR,$(binDir)/engine/render/build,$(exampleGameBuildDir))
69+
$(call COPY,$(binDir)/engine/render/build,$(exampleGameBuildDir),**)
7070
$(MKDIR) $(call platformpth,$(exampleGameBuildDir)/assets)
71-
$(call COPY_DIR,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets)
71+
$(call COPY,$(exampleGameSrcDir)/assets,$(exampleGameBuildDir)/assets,**)
7272

7373
# Package the built application and all its assets to the output directory
7474
package: all
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Geometry|POSITION:-0.00,-3.00,-6.00|ROTATION:0.000000|Z-INDEX:0|DIMENSIONS:5.00,0.10,5.00|MODEL_PATH:assets/models/cube/cube.obj|TEXTURE_PATH:models/cube/cube_1.png|
2-
Player|POSITION:0.00,3.00,-5.00|ROTATION:0.000000|Z-INDEX:0|MODEL_PATH:assets/models/cube/cube.obj|TEXTURE_PATH:models/cube/cube.png|
3-
Geometry|POSITION:-6.00,-2.00,-6.00|ROTATION:0.000000|Z-INDEX:0|DIMENSIONS:1.00,1.00,5.00|MODEL_PATH:assets/models/cube/cube.obj|TEXTURE_PATH:models/cube/cube_1.png|
1+
Geometry|POSITION:-0.00,0.00,-6.00|ROTATION:0.000000|Z-INDEX:0|DIMENSIONS:5.00,0.10,5.00|MODEL_PATH:assets/models/cube/cube.obj|TEXTURE_PATH:models/cube/cube_1.png|
2+
Player|POSITION:0.00,-3.00,-5.00|ROTATION:0.000000|Z-INDEX:0|MODEL_PATH:assets/models/cube/cube.obj|TEXTURE_PATH:models/cube/cube.png|
3+
Geometry|POSITION:-6.00,-1.00,-6.00|ROTATION:0.000000|Z-INDEX:0|DIMENSIONS:1.00,1.00,5.00|MODEL_PATH:assets/models/cube/cube.obj|TEXTURE_PATH:models/cube/cube_1.png|

examples/render/src/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ int main()
137137

138138
Siege::BoundedBox box = {{-.5f, 0, -.5f}, {.5f, -1.f, .5f}};
139139

140+
Siege::Renderer3D::SetGridEnabled(true);
141+
140142
while (!window.WindowShouldClose())
141143
{
142144
auto newTime = std::chrono::high_resolution_clock::now();

scripts/setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function Setup-FreeType {
103103
-DFT_DISABLE_BZIP2=TRUE `
104104
-DFT_DISABLE_HARFBUZZ=TRUE `
105105
-DZLIB_LIBRARY="$zlib_build_dir/lib/libz.a" `
106-
-DZLIB_INCLUDE_DIR="$zlib_build_dir" `
106+
-DZLIB_INCLUDE_DIR="$zlib_build_dir/include" `
107107
-DPNG_LIBRARY="$libpng_build_dir/lib/libpng.a" `
108108
-DPNG_PNG_INCLUDE_DIR="$libpng_build_dir/include" `
109109
-B"$build_dir" `

0 commit comments

Comments
 (0)