~vladh/peony

22be96c0e205cc573aa74497e96fe55d17bb3f35 — Vlad-Stefan Harbuz 5 months ago c5fa508 + b6279ed main
Merge branch 'main' of github.com:vladh/peony into main
5 files changed, 5 insertions(+), 5 deletions(-)

M .gitignore
A bin/.gitignore
M make_macos.mk
M make_windows.mk
M src/engine.cpp
M .gitignore => .gitignore +0 -1
@@ 1,4 1,3 @@
bin/
resources
*.ctm
*.trace

A bin/.gitignore => bin/.gitignore +2 -0
@@ 0,0 1,2 @@
*
!.gitignore

M make_macos.mk => make_macos.mk +1 -2
@@ 32,5 32,4 @@ unity:
	time g++ $(COMPILER_FLAGS) $(LINKER_FLAGS) src/_unity.cpp -o bin/peony

run:
	# ./bin/peony
	./bin/peony.app/Contents/MacOS/peony
	@./bin/peony.app/Contents/MacOS/peony

M make_windows.mk => make_windows.mk +1 -1
@@ 28,4 28,4 @@ unity:
	ctime -end bin/peony.ctm %LastError%

run:
	bin/peony.exe
	@bin/peony.exe

M src/engine.cpp => src/engine.cpp +1 -1
@@ 380,7 380,7 @@ namespace engine {
    }

    if (input::is_key_now_down(input_state, GLFW_KEY_0)) {
      *((unsigned int*)0) = 0xDEAD;
      *((volatile unsigned int*)0) = 0xDEAD;
    }
  }