Commit graph

66 commits

Author SHA1 Message Date
fgsfds
afca02c0a7 use 'rsync' instead of 'find' + 'cp -r --parents'
mostly because cp is fucking weird on OSX, thank you Apple very cool
2020-06-02 17:57:45 +03:00
fgsfds
6cee636382 change EXTERNAL_TEXTURES to EXTERNAL_DATA; load sound data from external files
no separation tho, just binary blobs o shit
2020-06-01 12:13:05 +03:00
fgsfds
e3401f1547 use a script to output zero-terminated strings instead of bash printf 2020-05-26 02:59:38 +03:00
fgsfds
9f9e79ed9d build the res target by default when EXTERNAL_TEXTURES is enabled 2020-05-26 02:18:09 +03:00
fgsfds
1873f7aba5 game now uses non-working directory paths by default
saves by default go into XDG_DATA_HOME/sm64pc

external data is read from the executable directory, if it's not found there on Unix systems the game will attempt to read it from some paths like /usr/local/share/sm64pc

both save data and readonly data fall back to other options in case of a problem

behavior can be overridden by specifying --datapath and --savepath on the CLI

both of those will expand the exclamation point ('!') to the executable path, e. g. --savepath '!/save'
2020-05-25 07:19:35 +03:00
fgsfds
9825b02f50 add option to load textures from external files
this stores the null terminated texture name instead of the texture data

activated with EXTERNAL_TEXTURES=1
2020-05-25 04:22:03 +03:00
fgsfds
eeca3b0ec0 remove debug print in Makefile 2020-05-25 00:58:43 +03:00
fgsfds
686ea5be7b separate options menu strings and add JP strings 2020-05-22 01:36:49 +03:00
IvanDSM
1298cd6017 Add commit hash to window title for nightly builds.
This also adds a flag for detecting nightly builds in the code.
2020-05-21 14:19:20 -03:00
fgsfds
c540712154 add GL1.3 (or 1.2 with some extensions) rendering backend
there are still some graphical glitches and no fog
2020-05-20 07:00:04 +03:00
fgsfds
c57bacdfd7 clean up some toolchain compatibility fixes
also rename the abs() macro to not cause any fucking conflicts ever again
2020-05-19 22:22:52 +03:00
Zerocker
6a628322ba Merge remote-tracking branch 'upstream/nightly' into nightly 2020-05-20 00:02:29 +09:00
zerocloude
d604711468
Merge pull request #153 from coltongit/patch-23
TARGET_N64 removal
2020-05-19 23:37:51 +09:00
Colton Rushton
41828987f2 Made the game even easier to compile in MXE. 2020-05-19 10:38:08 -03:00
Colton Rushton
9230cb832d Refactor PR #156 2020-05-19 10:32:01 -03:00
Zerocker
2417004d20 Added flag to support only text-based savefiles 2020-05-18 17:46:50 +09:00
Colton G. Rushton
71d7750d45
Makefile updated to thanos TARGET_N64 2020-05-17 08:19:04 -03:00
Colton G. Rushton
5d800819df
fix small bug with MXE compilation
the no-pie command line option was being sent to MXE when it shouldn't have been, breaking MXE compilation. Urgent fix.
2020-05-16 22:54:03 -03:00
Colton G. Rushton
410090a84c
Fix a few minor bugs with MXE compilation 2020-05-16 21:24:29 -03:00
Colton G. Rushton
bd4187c92b
Make MXE easier to compile in
Specifying the target arch MXE expects in the makefile makes it easier for MXE users to compile the game.
2020-05-16 21:04:55 -03:00
fgsfds
54f986a528
Merge branch 'master' into osx_build_clean 2020-05-17 01:27:51 +03:00
fgsfds
009aef1da5
Merge pull request #132 from coltongit/patch-12
Further fixes to MXE compilation
2020-05-17 01:24:14 +03:00
Colton G. Rushton
5c9e3c60a7
strip out now-needless NOBZERO flag 2020-05-16 19:20:45 -03:00
Colton G. Rushton
8736776545
Another fix to MXE 2020-05-16 17:20:33 -03:00
Colton G. Rushton
3d7bdc300c
Add NO_BZERO for MXE 2020-05-16 17:12:56 -03:00
fgsfds
ff844643d2
Merge branch 'master' into master 2020-05-16 22:47:39 +03:00
Hyenadae
5dd43ad674 OSX_BUILD cleaned commit 2020-05-16 15:30:27 -04:00
Colton G. Rushton
f4a3757145
Further fixes to MXE compilation
Adds on the work of PR #130.
2020-05-16 16:16:44 -03:00
fgsfds
efadc481ec
Merge pull request #130 from coltongit/patch-11
Fix compilation for MXE on Linux and WSL
2020-05-16 21:05:55 +03:00
Colton G. Rushton
3c6bf53dea
even further cleanup of the makefile 2020-05-16 14:59:27 -03:00
Colton G. Rushton
50af1393c3
Further clean up the makefile fixes 2020-05-16 14:38:47 -03:00
Colton G. Rushton
0a6ea9e9d4
Clean up the makefile fixes a bit 2020-05-16 14:35:56 -03:00
fgsfds
0446b244eb separate EXT_OPTIONS_MENU into its own option 2020-05-16 19:53:36 +03:00
Colton G. Rushton
31c91c6968
Nah dude, that's possible under WINDOWS_BUILD=1 2020-05-16 13:46:18 -03:00
Colton G. Rushton
74058cf32f
Simplify MXE fixes 2020-05-16 13:01:23 -03:00
Colton G. Rushton
17695a7b4f
fix objcopy on MXE builds 2020-05-16 12:56:58 -03:00
Colton G. Rushton
b4cb8a7f65
remove needless ifeq 2020-05-16 12:30:25 -03:00
Colton G. Rushton
0f688c80d0
removing a pesky endif 2020-05-16 12:26:06 -03:00
Colton G. Rushton
07aa2cd234
Fix compilation for MXE on Linux and WSL
Even though this isn't usually an option on the wiki, this will allow for cross-compilation of sm64pc through MXE on both Linux and WSL, making Wine testing much easier.
2020-05-16 12:21:16 -03:00
Colton G. Rushton
a83fa35c4d
Add compile-time texture fixes to Makefile
Add compile-time texture fixes as a Makefile build flag, set when `TEXTURE_FIX=1`.
2020-05-16 09:41:57 -03:00
Vinícius R. Miguel
4a13fd3380 Add in-game control binding menu
Originally on the testing branch
2020-05-15 15:38:35 -03:00
uwabami
24b672df33 Merge branch 'master' of https://github.com/sm64pc/sm64pc 2020-05-14 14:35:15 +02:00
Hyenadae
829c1f29a8 Fixed more border-related code and fixes to N64 build removal 2020-05-14 05:18:12 -04:00
Vinícius R. Miguel
47c4b7b41b
Show the console on Windows setting WINDOWS_CONSOLE=1 2020-05-13 13:23:52 -03:00
Jan200101
5f99e21592
extend cross compilation support 2020-05-12 16:08:34 +02:00
uwabami
c98a263cf4 adding option to disable draw distance 2020-05-12 09:26:16 +02:00
IvanDSM
1245f3c75e Windows build clarifications. 2020-05-10 16:50:48 -03:00
IvanDSM
5e2e510500 Disable bettercamera by default. 2020-05-10 15:08:59 -03:00
IvanDSM
6c7df61480 Add warning about WINDOWS_BUILD 2020-05-10 13:13:15 -03:00
IvanDSM
a0068c747b Fix Web build.
The ifeq($(TARGET_WEB),0) check on line 49 wasn't being endif'ed properly, which caused the rest of the code up until 244 (where an incorrect endif was placed) to be ignored.
This commit fixes that issue and allows web builds to work normally.
2020-05-10 12:45:46 -03:00