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

app will search for pk3 inside and next to the app bundle #245

Merged
merged 11 commits into from
Oct 17, 2023

Conversation

Bishop-333
Copy link
Contributor

I updated the icon as well because of a demand of a another mac user and its more original than the previous who was the same as ioquake3

I updated the icon as well because of a demand of a another mac user and its more original than the previous who was the same as ioquake3
@Bishop-333
Copy link
Contributor Author

I'll try to correct the build on windows machine and explain more precisely what ive done

@Bishop-333
Copy link
Contributor Author

Bishop-333 commented Sep 28, 2023

So instead of making the apple executable looking into the hidden directory named .q3a it will look at 3 differents locations : Library/Application Support/Quake3/baseq3 or baseq3 next to the executable or baseq3 inside the .app.
Apple users are not really used to hidden folders so no more .q3a created on macs.
I look at the makefile and it should not impact any windows machine since unix things are not compiled if im right.
For the unix machine it will not change anything too normally.
It's just backporting the thing who work for me from ioquake3.

@Bishop-333 Bishop-333 marked this pull request as draft September 29, 2023 06:09
@Bishop-333 Bishop-333 marked this pull request as ready for review October 5, 2023 03:51
@Bishop-333
Copy link
Contributor Author

@ec- I think it's ready to merge

@ec-
Copy link
Owner

ec- commented Oct 9, 2023

Please group all apple-related code in smaller file count (unix_main.c only for example) and do not declare apple-specific function prototypes in qcommon.h if it is never used on other platforms

@Bishop-333
Copy link
Contributor Author

Please group all apple-related code in smaller file count (unix_main.c only for example) and do not declare apple-specific function prototypes in qcommon.h if it is never used on other platforms

I'll try to do that but isnt it necessary to have functions defined in qcommon.h to have files.c and unix_main connected with the same functions ? Maybe I'm wrong

@ec-
Copy link
Owner

ec- commented Oct 10, 2023

I'll try to do that but isnt it necessary to have functions defined in qcommon.h to have files.c and unix_main connected with the same functions ? Maybe I'm wrong

How does Sys_SetDefaultBasePath() and Sys_Dirname() related to that?

@Bishop-333
Copy link
Contributor Author

Bishop-333 commented Oct 11, 2023

I'll try to do that but isnt it necessary to have functions defined in qcommon.h to have files.c and unix_main connected with the same functions ? Maybe I'm wrong

How does Sys_SetDefaultBasePath() and Sys_Dirname() related to that?

You right for theses two they are useless, i'll remove them from qcommon.h.
but you talked about the apple specific function like Sys_DefaultAppPath who is expressed only for apple machine can I let it in qcommon.h ?

@ec-
Copy link
Owner

ec- commented Oct 12, 2023

Sys_DefaultAppPath

sure it is ok to declare necessary function that it actually used in files.c but dirname/etc. could be isolated in unix*.c and not exported anywhere - that's my point, just alter minimal set of files/lines needed

@ec- ec- merged commit 9749ff5 into ec-:master Oct 17, 2023
22 checks passed
@Bishop-333 Bishop-333 deleted the apple-update branch December 16, 2023 09:46
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