Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SRB2 to 2.2.10 #3497

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update SRB2 to 2.2.10 #3497

wants to merge 2 commits into from

Conversation

cobalt2727
Copy link
Contributor

@cmitu
Copy link
Contributor

cmitu commented Mar 14, 2022

Thanks for taking a stab at updating this.
Note : you'll have to match the assets files with the installed files (in install_srb2). The new 2.2.10 release doesn't have the patch.pk3 included, so it should be taken out from md_ret_files.

@joolswills this will need an updated set of assets from https://github.com/STJr/SRB2/releases/download/SRB2_release_2.2.10/SRB2-v2210-Full.zip (srb2.pk3, music.dta, player.dta and zones.pk3).

It's unused in this version
@cobalt2727
Copy link
Contributor Author

(srb2.pk3, music.dta, player.dta and zones.pk3).

do the README.txt and LICENSE.txt files still exist? those should probably be kept in if they're still there

@cmitu
Copy link
Contributor

cmitu commented Mar 14, 2022

The files are part of the source repository (here).

@cobalt2727
Copy link
Contributor Author

Is there anything else needed for this PR, then?

@joolswills
Copy link
Member

joolswills commented Mar 17, 2022

No thanks. I will sort it.

@joolswills
Copy link
Member

SRB2_release_2.2.10 doesn't build on my Ubuntu 21.10 system due to an issue with the CMakeLists.txt

It needs the following

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ae93aac37..4fe16c37e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -253,7 +253,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
        set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value)
 endif()
 
-set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-trigraphs)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-trigraphs")
 
 target_compile_definitions(SRB2SDL2 PRIVATE -DCMAKECONFIG)

I need to make some other changes to the module so I won't be merging this as is - I will do a separate PR.

@joolswills
Copy link
Member

@cobalt2727
Copy link
Contributor Author

You might get a faster response on their GitLab.

@cmitu
Copy link
Contributor

cmitu commented May 5, 2023

@joolswills
Copy link
Member

@cmitu Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants