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.

Sign up for GitHub

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

Jump to bottom

Linux/GCC Support #28

Merged
merged 27 commits into from
May 11, 2022
Merged

Linux/GCC Support #28

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7e4fb41
Initial Linux/GCC support commit
Random06457 Mar 23, 2022
31dcd86
Add instructins for linux in the README
Random06457 Mar 23, 2022
edc20b6
merge upstream/master
Random06457 May 1, 2022
16bdea1
apply suggestions by @Erotemic and @Emill
Random06457 May 1, 2022
2399659
merge upstream/develop
Random06457 May 1, 2022
9ff2e26
Fix python 3.10 symlink line
sholdee May 2, 2022
2d25aa9
Merge pull request #2 from sholdee/patch-1
Random06457 May 2, 2022
04f1326
Fix func_80041E80 type mismatch (#3)
sholdee May 2, 2022
e5d0901
Makefile: clean OTRExporter/libultraship/ZAPDTR with distclean and fi…
Random06457 May 2, 2022
87c73f1
Makefile: find C/CXX_FILES automatically
Random06457 May 2, 2022
dc6dee0
Makefile: remove ugly conditions in find commands
Random06457 May 2, 2022
6d2fd04
cleanup _MSC_VER usage
Random06457 May 2, 2022
b7e721c
merge upstream/develop
Random06457 May 3, 2022
53e0b63
fix Windows build
Random06457 May 3, 2022
9ef1223
cleanup extraction scripts
Random06457 May 3, 2022
87be68c
fix Windows build
Random06457 May 3, 2022
47acc08
Fix Windows path separator issue
Random06457 May 6, 2022
7cbe902
Merge remote-tracking branch 'upstream/develop' into linux
Random06457 May 6, 2022
7306589
fix rumble support for linux
Random06457 May 11, 2022
1862eef
use glew-cmake in dockerfile
Random06457 May 11, 2022
2e7801d
add pulseaudio backend
Random06457 May 11, 2022
379e561
fix ZAPDTR linkage
Random06457 May 11, 2022
ddcc260
Check for "soh.elf" in directory (#6)
qurious-pixel May 11, 2022
cc6a7ca
Fix hardcoded segment addresses (#5)
GaryOderNichts May 11, 2022
573e83f
fix condition
Random06457 May 11, 2022
fa398b6
merge upstream/develop
Random06457 May 11, 2022
5cc9d63
hack lus -> soh dep for ZAPDTR
Random06457 May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions OTRGui/src/game/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void OTRGame::init(){
mat.shader = shader;
}

if(fs::exists("soh.exe") && !fs::exists("oot.otr")) {
if(fs::exists("soh.exe") || fs::exists("soh.elf") && !fs::exists("oot.otr")) {
Random06457 marked this conversation as resolved.
Show resolved Hide resolved
hide_second_btn = true;
sohFolder = ".";
}
Expand Down Expand Up @@ -220,4 +220,4 @@ void setCurrentStep(const std::string& step) {

void OTRGame::exit(){

}
}