diff options
| author | Random <28494085+Random06457@users.noreply.github.com> | 2022-05-12 02:18:24 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-11 13:18:24 -0400 |
| commit | 09432ee7f44ec1230826ca3ac3cdcf4b5a1f342d (patch) | |
| tree | 86a51be3e3727f6058446fe8757ac970ecff0746 /soh/src/code/z_player_lib.c | |
| parent | 2e1a0b51449ef223c3b10403a643c191ba0100ba (diff) | |
Linux/GCC Support (#28)
* Initial Linux/GCC support commit
* Add instructins for linux in the README
* apply suggestions by @Erotemic and @Emill
* Fix python 3.10 symlink line
* Fix func_80041E80 type mismatch (#3)
Type mismatch functions.h:664
* Makefile: clean OTRExporter/libultraship/ZAPDTR with distclean and fix CXX_FILES
* Makefile: find C/CXX_FILES automatically
* Makefile: remove ugly conditions in find commands
* cleanup _MSC_VER usage
* fix Windows build
* cleanup extraction scripts
* fix Windows build
* Fix Windows path separator issue
* fix rumble support for linux
* use glew-cmake in dockerfile
* add pulseaudio backend
* fix ZAPDTR linkage
* Check for "soh.elf" in directory (#6)
hide second button if `soh.exe` or `soh.elf` is present
* Fix hardcoded segment addresses (#5)
* fix condition
* hack lus -> soh dep for ZAPDTR
Co-authored-by: sholdee <102821812+sholdee@users.noreply.github.com>
Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com>
Co-authored-by: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Diffstat (limited to 'soh/src/code/z_player_lib.c')
| -rw-r--r-- | soh/src/code/z_player_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 7f3507abd..1c8e013f6 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -654,7 +654,7 @@ u8 sEyeMouthIndexes[][2] = { * from adult Link's object are used here. */ -#if defined(MODDING) || (_MSC_VER) +#if defined(MODDING) || defined(_MSC_VER) || defined(__GNUC__) //TODO: Formatting void* sEyeTextures[2][8] = { { gLinkAdultEyesOpenTex, gLinkAdultEyesHalfTex, gLinkAdultEyesClosedfTex, gLinkAdultEyesRollLeftTex, @@ -670,7 +670,7 @@ void* sEyeTextures[] = { }; #endif -#if defined(modding) || defined(_MSC_VER) +#if defined(MODDING) || defined(_MSC_VER) || defined(__GNUC__) void* sMouthTextures[2][4] = { { gLinkAdultMouth1Tex, @@ -726,7 +726,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, if (eyeIndex > 7) eyeIndex = 7; -#if defined(MODDING) || (_MSC_VER) +#if defined(MODDING) || defined(_MSC_VER) || defined(__GNUC__) gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[gSaveContext.linkAge][eyeIndex])); #else gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[eyeIndex])); @@ -738,7 +738,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, if (mouthIndex > 3) mouthIndex = 3; -#if defined(MODDING) || (_MSC_VER) +#if defined(MODDING) || defined(_MSC_VER) || defined(__GNUC__) gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[gSaveContext.linkAge][mouthIndex])); #else gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[eyeIndex])); |