Skip to content

Commit 73679f8

Browse files
Nix: Fix patch
1 parent 914a939 commit 73679f8

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

001-patch.diff

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/Makefile b/Makefile
2-
index 3edc8c93..54cf8c37 100644
2+
index 553b99a2..f9f51921 100644
33
--- a/Makefile
44
+++ b/Makefile
55
@@ -8,7 +8,7 @@ UNAME_M := $(shell uname -m)
@@ -20,7 +20,7 @@ index 3edc8c93..54cf8c37 100644
2020
CPPFLAGS += -Ithird_party/gl3w
2121
CPPFLAGS += -Ithird_party/googletest/googletest/include
2222
CPPFLAGS += -Ithird_party/imgui
23-
@@ -32,16 +30,10 @@ CPPFLAGS += -Ithird_party/imgui/backends
23+
@@ -32,16 +30,9 @@ CPPFLAGS += -Ithird_party/imgui/backends
2424
CPPFLAGS += -Ithird_party/imgui/examples
2525
CPPFLAGS += -Ithird_party/imgui/misc/cpp
2626
CPPFLAGS += -Ithird_party/libelfin
@@ -37,7 +37,7 @@ index 3edc8c93..54cf8c37 100644
3737
CPPFLAGS += -Ithird_party/zep/extensions
3838
CPPFLAGS += -Ithird_party/zep/include
3939
CPPFLAGS += -Ithird_party/xbyak/xbyak
40-
@@ -86,6 +78,8 @@ else
40+
@@ -86,6 +77,8 @@ else
4141
endif
4242

4343
LDFLAGS += third_party/luajit/src/libluajit.a
@@ -46,15 +46,15 @@ index 3edc8c93..54cf8c37 100644
4646
LDFLAGS += -ldl
4747
LDFLAGS += -g
4848

49-
@@ -109,7 +103,6 @@ endif
49+
@@ -109,7 +102,6 @@ endif
5050
LD := $(CXX)
5151

5252
SRCS := $(call rwildcard,src/,*.cc)
5353
-SRCS += third_party/fmt/src/os.cc third_party/fmt/src/format.cc
5454
IMGUI_SRCS += $(wildcard third_party/imgui/*.cpp)
5555
VIXL_SRCS := $(call rwildcard, third_party/vixl/src,*.cc)
5656
SRCS += $(IMGUI_SRCS)
57-
@@ -129,16 +122,10 @@ SRCS += third_party/imgui/misc/freetype/imgui_freetype.cpp
57+
@@ -129,17 +121,10 @@ SRCS += third_party/imgui/misc/freetype/imgui_freetype.cpp
5858
SRCS += third_party/imgui_lua_bindings/imgui_lua_bindings.cpp
5959
SRCS += third_party/imgui_md/imgui_md.cpp
6060
SRCS += third_party/imgui_memory_editor/imgui_memory_editor.cpp
@@ -71,7 +71,8 @@ index 3edc8c93..54cf8c37 100644
7171
-SRCS += $(wildcard third_party/uriparser/src/*.c)
7272
SRCS += third_party/zep/extensions/repl/mode_repl.cpp
7373
SRCS += $(wildcard third_party/zep/src/*.cpp)
74-
@@ -167,8 +154,6 @@ ifeq ($(CROSS),arm64)
74+
SRCS += third_party/zep/src/mcommon/animation/timer.cpp
75+
@@ -167,8 +152,6 @@ ifeq ($(CROSS),arm64)
7576
endif
7677
SUPPORT_SRCS := src/support/file.cc src/support/mem4g.cc src/support/zfile.cc
7778
SUPPORT_SRCS += src/supportpsx/adpcm.cc src/supportpsx/binloader.cc src/supportpsx/ps1-packer.cc

0 commit comments

Comments
 (0)