Skip to content

Commit d996b1f

Browse files
Alto1772Alto1772
committed
[TEST] spaghettikart-git: update cmake-flags patch
Testing for building without the patch included
1 parent 7806d51 commit d996b1f

3 files changed

Lines changed: 58 additions & 58 deletions

File tree

‎spaghettikart-git/.SRCINFO‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = spaghettikart-git
22
pkgdesc = An unofficial native port of Mario Kart 64 (git)
3-
pkgver = 0.9.9.1.r227.g5fc7aebf8
3+
pkgver = 0.9.9.1.r238.gaaae77f3b
44
pkgrel = 1
55
url = https://github.com/HarbourMasters/SpaghettiKart
66
install = spaghettikart.install
@@ -35,7 +35,7 @@ pkgbase = spaghettikart-git
3535
sha256sums = SKIP
3636
sha256sums = SKIP
3737
sha256sums = SKIP
38-
sha256sums = c3ddb5e596b0d17aab6cf5851558b56dd65057f406b9b2f2baac363fe82c59d2
38+
sha256sums = 9dc9125a0498a26e4878abdbef3f102602af2d0608312e5ae302b1b68b4d4f27
3939
sha256sums = 4c17e6b2514dbc11c87542b2c99bb2de1fed8747a562b9c26a908c3ea86a6f5e
4040

4141
pkgname = spaghettikart-git

‎spaghettikart-git/PKGBUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
_reponame=SpaghettiKart
44
pkgname=spaghettikart-git
5-
pkgver=0.9.9.1.r227.g5fc7aebf8
5+
pkgver=0.9.9.1.r238.gaaae77f3b
66
pkgrel=1
77
pkgdesc="An unofficial native port of Mario Kart 64 (git)"
88
license=("unknown" "MIT")
@@ -23,7 +23,7 @@ sha256sums=('SKIP'
2323
'SKIP'
2424
'SKIP'
2525
'SKIP'
26-
'c3ddb5e596b0d17aab6cf5851558b56dd65057f406b9b2f2baac363fe82c59d2'
26+
'9dc9125a0498a26e4878abdbef3f102602af2d0608312e5ae302b1b68b4d4f27'
2727
'4c17e6b2514dbc11c87542b2c99bb2de1fed8747a562b9c26a908c3ea86a6f5e')
2828

2929
SHIP_PREFIX=/opt/spaghettikart
@@ -62,7 +62,7 @@ prepare() {
6262
_init_submodule torch Torch
6363

6464
# Required patch for compilation
65-
patch -Np1 -i "../spaghettikart-cmake-flags.patch"
65+
#patch -Np1 -i "../spaghettikart-cmake-flags.patch"
6666
}
6767

6868
build() {

‎spaghettikart-git/spaghettikart-cmake-flags.patch‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5f6fdc685057d3fa54be96340670ccbbc239ecfa Mon Sep 17 00:00:00 2001
1+
From 5f6a5453b2088ca7061d8b610a60f7a06f581119 Mon Sep 17 00:00:00 2001
22
From: AltoXorg <56553686+Alto1772@users.noreply.github.com>
33
Date: Sun, 10 Aug 2025 13:01:16 +0800
44
Subject: [PATCH] Readd project compile options
@@ -8,75 +8,75 @@ Subject: [PATCH] Readd project compile options
88
1 file changed, 36 insertions(+), 15 deletions(-)
99

1010
diff --git a/CMakeLists.txt b/CMakeLists.txt
11-
index c4870b59b..2d55efc2b 100644
11+
index 9b4be14c9..4a6e3eb0f 100644
1212
--- a/CMakeLists.txt
1313
+++ b/CMakeLists.txt
14-
@@ -163,21 +163,21 @@ endif()
14+
@@ -164,21 +164,21 @@ endif()
1515
################################################################################
1616
# Global configuration types
1717
################################################################################
1818
-if (MSVC)
19-
- set(CMAKE_C_FLAGS_DEBUG "/Od /Zi /DNDEBUG ${COMMON_C_FLAGS}")
20-
- set(CMAKE_CXX_FLAGS_DEBUG "/Od /Zi /DNDEBUG ${COMMON_CXX_FLAGS}")
21-
- set(CMAKE_C_FLAGS_RELEASE "/O2 /DNDEBUG ${COMMON_C_FLAGS}")
22-
- set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG ${COMMON_CXX_FLAGS}")
19+
- set(CMAKE_C_FLAGS_DEBUG "/Od /Zi /DNDEBUG ${COMMON_C_FLAGS}")
20+
- set(CMAKE_CXX_FLAGS_DEBUG "/Od /Zi /DNDEBUG ${COMMON_CXX_FLAGS}")
21+
- set(CMAKE_C_FLAGS_RELEASE "/O2 /DNDEBUG ${COMMON_C_FLAGS}")
22+
- set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG ${COMMON_CXX_FLAGS}")
2323
-else()
24-
- set(CMAKE_C_FLAGS_DEBUG "-g -DNDEBUG ${COMMON_C_FLAGS}")
25-
- set(CMAKE_CXX_FLAGS_DEBUG "-g -DNDEBUG ${COMMON_CXX_FLAGS}")
26-
- set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG ${COMMON_C_FLAGS}")
27-
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG ${COMMON_CXX_FLAGS}")
28-
- set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${COMMON_C_FLAGS}")
29-
- set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${COMMON_CXX_FLAGS}")
30-
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${COMMON_C_FLAGS}")
31-
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${COMMON_CXX_FLAGS}")
24+
- set(CMAKE_C_FLAGS_DEBUG "-g -DNDEBUG ${COMMON_C_FLAGS}")
25+
- set(CMAKE_CXX_FLAGS_DEBUG "-g -DNDEBUG ${COMMON_CXX_FLAGS}")
26+
- set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG ${COMMON_C_FLAGS}")
27+
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG ${COMMON_CXX_FLAGS}")
28+
- set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${COMMON_C_FLAGS}")
29+
- set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${COMMON_CXX_FLAGS}")
30+
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${COMMON_C_FLAGS}")
31+
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${COMMON_CXX_FLAGS}")
3232
-endif()
3333
+#if (MSVC)
34-
+# set(CMAKE_C_FLAGS_DEBUG "/Od /Zi /DNDEBUG ${COMMON_C_FLAGS}")
35-
+# set(CMAKE_CXX_FLAGS_DEBUG "/Od /Zi /DNDEBUG ${COMMON_CXX_FLAGS}")
36-
+# set(CMAKE_C_FLAGS_RELEASE "/O2 /DNDEBUG ${COMMON_C_FLAGS}")
37-
+# set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG ${COMMON_CXX_FLAGS}")
34+
+# set(CMAKE_C_FLAGS_DEBUG "/Od /Zi /DNDEBUG ${COMMON_C_FLAGS}")
35+
+# set(CMAKE_CXX_FLAGS_DEBUG "/Od /Zi /DNDEBUG ${COMMON_CXX_FLAGS}")
36+
+# set(CMAKE_C_FLAGS_RELEASE "/O2 /DNDEBUG ${COMMON_C_FLAGS}")
37+
+# set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG ${COMMON_CXX_FLAGS}")
3838
+#else()
39-
+# set(CMAKE_C_FLAGS_DEBUG "-g -DNDEBUG ${COMMON_C_FLAGS}")
40-
+# set(CMAKE_CXX_FLAGS_DEBUG "-g -DNDEBUG ${COMMON_CXX_FLAGS}")
41-
+# set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG ${COMMON_C_FLAGS}")
42-
+# set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG ${COMMON_CXX_FLAGS}")
43-
+# set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${COMMON_C_FLAGS}")
44-
+# set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${COMMON_CXX_FLAGS}")
45-
+# set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${COMMON_C_FLAGS}")
46-
+# set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${COMMON_CXX_FLAGS}")
39+
+# set(CMAKE_C_FLAGS_DEBUG "-g -DNDEBUG ${COMMON_C_FLAGS}")
40+
+# set(CMAKE_CXX_FLAGS_DEBUG "-g -DNDEBUG ${COMMON_CXX_FLAGS}")
41+
+# set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG ${COMMON_C_FLAGS}")
42+
+# set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG ${COMMON_CXX_FLAGS}")
43+
+# set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${COMMON_C_FLAGS}")
44+
+# set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${COMMON_CXX_FLAGS}")
45+
+# set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${COMMON_C_FLAGS}")
46+
+# set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${COMMON_CXX_FLAGS}")
4747
+#endif()
4848

4949
# Set game compilation version
5050
set(VERSION us)
51-
@@ -638,7 +638,28 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
52-
set(CPU_OPTION -msse2 -mfpmath=sse)
53-
endif()
51+
@@ -645,7 +645,28 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
52+
set(CPU_OPTION -msse2 -mfpmath=sse)
53+
endif()
5454

55-
+ # [PATCH] Readd project compile options
56-
+ # CFLAGS, CXXFLAGS environment vars when defined, gets used instead of CMAKE_C_FLAGS that's defined above
57-
+ # Flags such as critical warnings won't get used due to not being present during compilation
58-
target_compile_options(${PROJECT_NAME} PRIVATE
59-
+ -Wall -Wextra -Wno-error
60-
+ -Wno-unused-parameter
61-
+ -Wno-unused-function
62-
+ -Wno-unused-variable
63-
+ -Wno-missing-field-initializers
64-
+ -Wno-parentheses
65-
+ -Wno-narrowing
66-
+ -Wno-missing-braces
67-
+ $<$<COMPILE_LANGUAGE:C>:
68-
+ -Wno-int-conversion
69-
+ -Werror-implicit-function-declaration
70-
+ -Wno-incompatible-pointer-types
71-
+ >
72-
+ $<$<COMPILE_LANGUAGE:CXX>:
73-
+ -Wno-c++11-narrowing
74-
+ -Wno-deprecated-enum-enum-conversion
75-
+ -fpermissive -fomit-frame-pointer
76-
+ >
55+
+ # [PATCH] Readd project compile options
56+
+ # CFLAGS, CXXFLAGS environment vars when defined, gets used instead of CMAKE_C_FLAGS that's defined above
57+
+ # Flags such as critical warnings won't get used due to not being present during compilation
58+
target_compile_options(${PROJECT_NAME} PRIVATE
59+
+ -Wall -Wextra -Wno-error
60+
+ -Wno-unused-parameter
61+
+ -Wno-unused-function
62+
+ -Wno-unused-variable
63+
+ -Wno-missing-field-initializers
64+
+ -Wno-parentheses
65+
+ -Wno-narrowing
66+
+ -Wno-missing-braces
67+
+ $<$<COMPILE_LANGUAGE:C>:
68+
+ -Wno-int-conversion
69+
+ -Werror-implicit-function-declaration
70+
+ -Wno-incompatible-pointer-types
71+
+ >
72+
+ $<$<COMPILE_LANGUAGE:CXX>:
73+
+ -Wno-c++11-narrowing
74+
+ -Wno-deprecated-enum-enum-conversion
75+
+ -fpermissive -fomit-frame-pointer
76+
+ >
7777
-pthread
7878
${CPU_OPTION}
7979
)
8080
--
81-
2.52.0
81+
2.53.0
8282

0 commit comments

Comments
 (0)