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

Add macOS support #5

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

Conversation

conradev
Copy link

@conradev conradev commented Oct 4, 2021

I will be adding platforms:Mac in an upcoming PR to xenia

config.h Outdated
#if defined(WIN32) || defined(_WIN32)
#include "config_windows_x86_64.h"
#elif defined(__gnu_linux__)
#include "config_linux_x86_64.h"
#elif defined(TARGET_OS_MAC) && TARGET_OS_MAC
Copy link
Member

@Triang3l Triang3l Oct 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both defined(TARGET_OS_MAC) and TARGET_OS_MAC are not required, all non-existent preprocessor identifiers are expanded to 0 in preprocessor conditionals. If this is defined as always 1 when true (rather than just to an empty value — and according to what I can find, it is indeed defined as 1), just a TARGET_OS_MAC check is enough.

@@ -128,7 +128,7 @@ project("libavcodec")

-- libavcodec/x86/Makefile:
-- OBJS:
filter({"platforms:Android_x86_64 or platforms:Linux or platforms:Windows"})
filter({"platforms:Android_x86_64 or platforms:Linux or platforms:Mac or platforms:Windows"})
Copy link
Member

@Triang3l Triang3l Oct 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This filter (here and in 2 more places) can be shortened to platforms:Android_x86_64 or Linux or Mac or Windows.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But its autogenerated and the generator doesnt know about that ☺️

@JoelLinn
Copy link
Member

JoelLinn commented Oct 4, 2021

I would prefer to have three separate commits (like seen in commit history):

  • config*.h changes
  • premake generator python changes
  • file generation (premake5.lua)

This will make it easier to rebase our changes to newer ffmpeg and squash some commits to the premake generator for example

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