Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 78 additions & 1 deletion .github/workflows/meson.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,84 @@ jobs:
path: CortexCommand.AppImage
if-no-files-found: error

build-macos:
build-macos-arm:
runs-on: macos-latest
name: MacOS Build

env:
MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: "Install Dependencies"
run: |
brew install ccache pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb ninja meson dylibbundler

- name: Set Version
if: ${{inputs.new_release_version}}
uses: ./.github/actions/set_version
with:
new_release_version: ${{inputs.new_release_version}}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ github.job }}-${{ matrix.os }}

- name: Setup Meson
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
CC: "gcc-14"
CXX: "g++-14"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson configure \
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
--bindir=Contents/MacOS \
--prefix="/" \
-Ddylibbundler_args="-ns" \
build

- name: Build
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson compile -C build

- name: Create App Bundle
if: ${{inputs.upload_artefacts}}
run: |
meson install --destdir="/tmp/Cortex Command.app" -C build

- name: Tar files
if: ${{inputs.upload_artefacts}}
run: |
cd /tmp/
tar -cvf CortexCommand.tar "Cortex Command.app"

- name: Move artefact
if: ${{inputs.upload_artefacts}}
run: cp /tmp/CortexCommand.tar .

- name: Artifact Deploy
if: ${{inputs.upload_artefacts}}
uses: actions/upload-artifact@v4
with:
name: CortexCommand (macOS)
path: |
CortexCommand.tar
if-no-files-found: error

build-macos-x86:
runs-on: ubuntu-latest
name: MacOS Build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)

**Homebrew (macOS):**
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
`brew install pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`

**Arch Linux:**
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
Expand Down
2 changes: 1 addition & 1 deletion Source/Managers/WindowMan.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ void WindowMan::Initialize() {

SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are these changes still necessary/valid with the changes in b5b183e?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, that CL is older. No idea why it's merge conflicting, but eh

SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
CreatePrimaryWindow();
InitializeOpenGL();
Expand Down
7 changes: 4 additions & 3 deletions meson.build
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,10 +200,11 @@ if host_machine.system() in ['linux','darwin']
dependency('liblz4'),
dependency('libpng'),
dependency('tbb'),
dependency('gl')
]
if host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation'])
if host_machine.system() == 'linux'
deps += dependency('gl')
elif host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation', 'OpenGL'])
endif
bfd = compiler.find_library('bfd', required: false)
if bfd.found()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Macos Arm build by HeliumAnt · Pull Request #173 · cortex-command-community/Cortex-Command-Community-Project · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 78 additions & 1 deletion .github/workflows/meson.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,84 @@ jobs:
path: CortexCommand.AppImage
if-no-files-found: error

build-macos:
build-macos-arm:
runs-on: macos-latest
name: MacOS Build

env:
MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: "Install Dependencies"
run: |
brew install ccache pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb ninja meson dylibbundler

- name: Set Version
if: ${{inputs.new_release_version}}
uses: ./.github/actions/set_version
with:
new_release_version: ${{inputs.new_release_version}}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ github.job }}-${{ matrix.os }}

- name: Setup Meson
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
CC: "gcc-14"
CXX: "g++-14"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson configure \
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
--bindir=Contents/MacOS \
--prefix="/" \
-Ddylibbundler_args="-ns" \
build

- name: Build
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson compile -C build

- name: Create App Bundle
if: ${{inputs.upload_artefacts}}
run: |
meson install --destdir="/tmp/Cortex Command.app" -C build

- name: Tar files
if: ${{inputs.upload_artefacts}}
run: |
cd /tmp/
tar -cvf CortexCommand.tar "Cortex Command.app"

- name: Move artefact
if: ${{inputs.upload_artefacts}}
run: cp /tmp/CortexCommand.tar .

- name: Artifact Deploy
if: ${{inputs.upload_artefacts}}
uses: actions/upload-artifact@v4
with:
name: CortexCommand (macOS)
path: |
CortexCommand.tar
if-no-files-found: error

build-macos-x86:
runs-on: ubuntu-latest
name: MacOS Build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)

**Homebrew (macOS):**
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
`brew install pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`

**Arch Linux:**
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
Expand Down
2 changes: 1 addition & 1 deletion Source/Managers/WindowMan.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ void WindowMan::Initialize() {

SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are these changes still necessary/valid with the changes in b5b183e?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, that CL is older. No idea why it's merge conflicting, but eh

SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
CreatePrimaryWindow();
InitializeOpenGL();
Expand Down
7 changes: 4 additions & 3 deletions meson.build
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,10 +200,11 @@ if host_machine.system() in ['linux','darwin']
dependency('liblz4'),
dependency('libpng'),
dependency('tbb'),
dependency('gl')
]
if host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation'])
if host_machine.system() == 'linux'
deps += dependency('gl')
elif host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation', 'OpenGL'])
endif
bfd = compiler.find_library('bfd', required: false)
if bfd.found()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Macos Arm build by HeliumAnt · Pull Request #173 · cortex-command-community/Cortex-Command-Community-Project · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 78 additions & 1 deletion .github/workflows/meson.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,84 @@ jobs:
path: CortexCommand.AppImage
if-no-files-found: error

build-macos:
build-macos-arm:
runs-on: macos-latest
name: MacOS Build

env:
MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: "Install Dependencies"
run: |
brew install ccache pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb ninja meson dylibbundler

- name: Set Version
if: ${{inputs.new_release_version}}
uses: ./.github/actions/set_version
with:
new_release_version: ${{inputs.new_release_version}}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ github.job }}-${{ matrix.os }}

- name: Setup Meson
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
CC: "gcc-14"
CXX: "g++-14"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson configure \
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
--bindir=Contents/MacOS \
--prefix="/" \
-Ddylibbundler_args="-ns" \
build

- name: Build
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson compile -C build

- name: Create App Bundle
if: ${{inputs.upload_artefacts}}
run: |
meson install --destdir="/tmp/Cortex Command.app" -C build

- name: Tar files
if: ${{inputs.upload_artefacts}}
run: |
cd /tmp/
tar -cvf CortexCommand.tar "Cortex Command.app"

- name: Move artefact
if: ${{inputs.upload_artefacts}}
run: cp /tmp/CortexCommand.tar .

- name: Artifact Deploy
if: ${{inputs.upload_artefacts}}
uses: actions/upload-artifact@v4
with:
name: CortexCommand (macOS)
path: |
CortexCommand.tar
if-no-files-found: error

build-macos-x86:
runs-on: ubuntu-latest
name: MacOS Build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)

**Homebrew (macOS):**
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
`brew install pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`

**Arch Linux:**
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
Expand Down
2 changes: 1 addition & 1 deletion Source/Managers/WindowMan.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ void WindowMan::Initialize() {

SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are these changes still necessary/valid with the changes in b5b183e?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, that CL is older. No idea why it's merge conflicting, but eh

SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
CreatePrimaryWindow();
InitializeOpenGL();
Expand Down
7 changes: 4 additions & 3 deletions meson.build
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,10 +200,11 @@ if host_machine.system() in ['linux','darwin']
dependency('liblz4'),
dependency('libpng'),
dependency('tbb'),
dependency('gl')
]
if host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation'])
if host_machine.system() == 'linux'
deps += dependency('gl')
elif host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation', 'OpenGL'])
endif
bfd = compiler.find_library('bfd', required: false)
if bfd.found()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Macos Arm build by HeliumAnt · Pull Request #173 · cortex-command-community/Cortex-Command-Community-Project · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 78 additions & 1 deletion .github/workflows/meson.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,84 @@ jobs:
path: CortexCommand.AppImage
if-no-files-found: error

build-macos:
build-macos-arm:
runs-on: macos-latest
name: MacOS Build

env:
MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: "Install Dependencies"
run: |
brew install ccache pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb ninja meson dylibbundler

- name: Set Version
if: ${{inputs.new_release_version}}
uses: ./.github/actions/set_version
with:
new_release_version: ${{inputs.new_release_version}}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ github.job }}-${{ matrix.os }}

- name: Setup Meson
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
CC: "gcc-14"
CXX: "g++-14"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson configure \
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
--bindir=Contents/MacOS \
--prefix="/" \
-Ddylibbundler_args="-ns" \
build

- name: Build
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson compile -C build

- name: Create App Bundle
if: ${{inputs.upload_artefacts}}
run: |
meson install --destdir="/tmp/Cortex Command.app" -C build

- name: Tar files
if: ${{inputs.upload_artefacts}}
run: |
cd /tmp/
tar -cvf CortexCommand.tar "Cortex Command.app"

- name: Move artefact
if: ${{inputs.upload_artefacts}}
run: cp /tmp/CortexCommand.tar .

- name: Artifact Deploy
if: ${{inputs.upload_artefacts}}
uses: actions/upload-artifact@v4
with:
name: CortexCommand (macOS)
path: |
CortexCommand.tar
if-no-files-found: error

build-macos-x86:
runs-on: ubuntu-latest
name: MacOS Build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)

**Homebrew (macOS):**
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
`brew install pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`

**Arch Linux:**
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
Expand Down
2 changes: 1 addition & 1 deletion Source/Managers/WindowMan.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ void WindowMan::Initialize() {

SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are these changes still necessary/valid with the changes in b5b183e?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, that CL is older. No idea why it's merge conflicting, but eh

SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
CreatePrimaryWindow();
InitializeOpenGL();
Expand Down
7 changes: 4 additions & 3 deletions meson.build
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,10 +200,11 @@ if host_machine.system() in ['linux','darwin']
dependency('liblz4'),
dependency('libpng'),
dependency('tbb'),
dependency('gl')
]
if host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation'])
if host_machine.system() == 'linux'
deps += dependency('gl')
elif host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation', 'OpenGL'])
endif
bfd = compiler.find_library('bfd', required: false)
if bfd.found()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Macos Arm build by HeliumAnt · Pull Request #173 · cortex-command-community/Cortex-Command-Community-Project · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 78 additions & 1 deletion .github/workflows/meson.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,84 @@ jobs:
path: CortexCommand.AppImage
if-no-files-found: error

build-macos:
build-macos-arm:
runs-on: macos-latest
name: MacOS Build

env:
MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: "Install Dependencies"
run: |
brew install ccache pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb ninja meson dylibbundler

- name: Set Version
if: ${{inputs.new_release_version}}
uses: ./.github/actions/set_version
with:
new_release_version: ${{inputs.new_release_version}}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ github.job }}-${{ matrix.os }}

- name: Setup Meson
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
CC: "gcc-14"
CXX: "g++-14"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson configure \
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
--bindir=Contents/MacOS \
--prefix="/" \
-Ddylibbundler_args="-ns" \
build

- name: Build
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson compile -C build

- name: Create App Bundle
if: ${{inputs.upload_artefacts}}
run: |
meson install --destdir="/tmp/Cortex Command.app" -C build

- name: Tar files
if: ${{inputs.upload_artefacts}}
run: |
cd /tmp/
tar -cvf CortexCommand.tar "Cortex Command.app"

- name: Move artefact
if: ${{inputs.upload_artefacts}}
run: cp /tmp/CortexCommand.tar .

- name: Artifact Deploy
if: ${{inputs.upload_artefacts}}
uses: actions/upload-artifact@v4
with:
name: CortexCommand (macOS)
path: |
CortexCommand.tar
if-no-files-found: error

build-macos-x86:
runs-on: ubuntu-latest
name: MacOS Build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)

**Homebrew (macOS):**
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
`brew install pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`

**Arch Linux:**
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
Expand Down
2 changes: 1 addition & 1 deletion Source/Managers/WindowMan.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ void WindowMan::Initialize() {

SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are these changes still necessary/valid with the changes in b5b183e?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, that CL is older. No idea why it's merge conflicting, but eh

SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
CreatePrimaryWindow();
InitializeOpenGL();
Expand Down
7 changes: 4 additions & 3 deletions meson.build
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,10 +200,11 @@ if host_machine.system() in ['linux','darwin']
dependency('liblz4'),
dependency('libpng'),
dependency('tbb'),
dependency('gl')
]
if host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation'])
if host_machine.system() == 'linux'
deps += dependency('gl')
elif host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation', 'OpenGL'])
endif
bfd = compiler.find_library('bfd', required: false)
if bfd.found()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Macos Arm build by HeliumAnt · Pull Request #173 · cortex-command-community/Cortex-Command-Community-Project · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 78 additions & 1 deletion .github/workflows/meson.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,84 @@ jobs:
path: CortexCommand.AppImage
if-no-files-found: error

build-macos:
build-macos-arm:
runs-on: macos-latest
name: MacOS Build

env:
MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: "Install Dependencies"
run: |
brew install ccache pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb ninja meson dylibbundler

- name: Set Version
if: ${{inputs.new_release_version}}
uses: ./.github/actions/set_version
with:
new_release_version: ${{inputs.new_release_version}}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ github.job }}-${{ matrix.os }}

- name: Setup Meson
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
CC: "gcc-14"
CXX: "g++-14"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson configure \
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
--bindir=Contents/MacOS \
--prefix="/" \
-Ddylibbundler_args="-ns" \
build

- name: Build
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson compile -C build

- name: Create App Bundle
if: ${{inputs.upload_artefacts}}
run: |
meson install --destdir="/tmp/Cortex Command.app" -C build

- name: Tar files
if: ${{inputs.upload_artefacts}}
run: |
cd /tmp/
tar -cvf CortexCommand.tar "Cortex Command.app"

- name: Move artefact
if: ${{inputs.upload_artefacts}}
run: cp /tmp/CortexCommand.tar .

- name: Artifact Deploy
if: ${{inputs.upload_artefacts}}
uses: actions/upload-artifact@v4
with:
name: CortexCommand (macOS)
path: |
CortexCommand.tar
if-no-files-found: error

build-macos-x86:
runs-on: ubuntu-latest
name: MacOS Build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)

**Homebrew (macOS):**
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
`brew install pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`

**Arch Linux:**
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
Expand Down
2 changes: 1 addition & 1 deletion Source/Managers/WindowMan.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ void WindowMan::Initialize() {

SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are these changes still necessary/valid with the changes in b5b183e?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, that CL is older. No idea why it's merge conflicting, but eh

SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
CreatePrimaryWindow();
InitializeOpenGL();
Expand Down
7 changes: 4 additions & 3 deletions meson.build
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,10 +200,11 @@ if host_machine.system() in ['linux','darwin']
dependency('liblz4'),
dependency('libpng'),
dependency('tbb'),
dependency('gl')
]
if host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation'])
if host_machine.system() == 'linux'
deps += dependency('gl')
elif host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation', 'OpenGL'])
endif
bfd = compiler.find_library('bfd', required: false)
if bfd.found()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Macos Arm build by HeliumAnt · Pull Request #173 · cortex-command-community/Cortex-Command-Community-Project · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 78 additions & 1 deletion .github/workflows/meson.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,84 @@ jobs:
path: CortexCommand.AppImage
if-no-files-found: error

build-macos:
build-macos-arm:
runs-on: macos-latest
name: MacOS Build

env:
MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: "Install Dependencies"
run: |
brew install ccache pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb ninja meson dylibbundler

- name: Set Version
if: ${{inputs.new_release_version}}
uses: ./.github/actions/set_version
with:
new_release_version: ${{inputs.new_release_version}}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ github.job }}-${{ matrix.os }}

- name: Setup Meson
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
CC: "gcc-14"
CXX: "g++-14"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson configure \
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
--bindir=Contents/MacOS \
--prefix="/" \
-Ddylibbundler_args="-ns" \
build

- name: Build
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson compile -C build

- name: Create App Bundle
if: ${{inputs.upload_artefacts}}
run: |
meson install --destdir="/tmp/Cortex Command.app" -C build

- name: Tar files
if: ${{inputs.upload_artefacts}}
run: |
cd /tmp/
tar -cvf CortexCommand.tar "Cortex Command.app"

- name: Move artefact
if: ${{inputs.upload_artefacts}}
run: cp /tmp/CortexCommand.tar .

- name: Artifact Deploy
if: ${{inputs.upload_artefacts}}
uses: actions/upload-artifact@v4
with:
name: CortexCommand (macOS)
path: |
CortexCommand.tar
if-no-files-found: error

build-macos-x86:
runs-on: ubuntu-latest
name: MacOS Build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)

**Homebrew (macOS):**
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
`brew install pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`

**Arch Linux:**
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
Expand Down
2 changes: 1 addition & 1 deletion Source/Managers/WindowMan.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ void WindowMan::Initialize() {

SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are these changes still necessary/valid with the changes in b5b183e?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, that CL is older. No idea why it's merge conflicting, but eh

SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
CreatePrimaryWindow();
InitializeOpenGL();
Expand Down
7 changes: 4 additions & 3 deletions meson.build
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,10 +200,11 @@ if host_machine.system() in ['linux','darwin']
dependency('liblz4'),
dependency('libpng'),
dependency('tbb'),
dependency('gl')
]
if host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation'])
if host_machine.system() == 'linux'
deps += dependency('gl')
elif host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation', 'OpenGL'])
endif
bfd = compiler.find_library('bfd', required: false)
if bfd.found()
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Macos Arm build by HeliumAnt · Pull Request #173 · cortex-command-community/Cortex-Command-Community-Project · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
79 changes: 78 additions & 1 deletion .github/workflows/meson.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,7 +147,84 @@ jobs:
path: CortexCommand.AppImage
if-no-files-found: error

build-macos:
build-macos-arm:
runs-on: macos-latest
name: MacOS Build

env:
MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- name: "Install Dependencies"
run: |
brew install ccache pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb ninja meson dylibbundler

- name: Set Version
if: ${{inputs.new_release_version}}
uses: ./.github/actions/set_version
with:
new_release_version: ${{inputs.new_release_version}}
github_token: ${{ secrets.GITHUB_TOKEN }}

- name: ccache
uses: hendrikmuhs/ccache-action@v1
with:
key: ${{ github.job }}-${{ matrix.os }}

- name: Setup Meson
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
CC: "gcc-14"
CXX: "g++-14"
run: |
meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build

- name: Configure for App Bundle
if: ${{inputs.upload_artefacts}}
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson configure \
-Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
--bindir=Contents/MacOS \
--prefix="/" \
-Ddylibbundler_args="-ns" \
build

- name: Build
env:
LDFLAGS: "-static-libgcc -static-libstdc++"
run: |
meson compile -C build

- name: Create App Bundle
if: ${{inputs.upload_artefacts}}
run: |
meson install --destdir="/tmp/Cortex Command.app" -C build

- name: Tar files
if: ${{inputs.upload_artefacts}}
run: |
cd /tmp/
tar -cvf CortexCommand.tar "Cortex Command.app"

- name: Move artefact
if: ${{inputs.upload_artefacts}}
run: cp /tmp/CortexCommand.tar .

- name: Artifact Deploy
if: ${{inputs.upload_artefacts}}
uses: actions/upload-artifact@v4
with:
name: CortexCommand (macOS)
path: |
CortexCommand.tar
if-no-files-found: error

build-macos-x86:
runs-on: ubuntu-latest
name: MacOS Build

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ If you want to change the buildtype afterwards, you can use `meson configure --b
- `Xcode` or `Command Line Tools for Xcode` (if you need to, you can also generate an xcode project from meson using the `--backend=xcode` option on setup)

**Homebrew (macOS):**
`brew install pkg-config sdl2 minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`
`brew install pkg-config sdl2 sdl2_image minizip lz4 flac luajit lua libpng tbb gcc@13 ninja meson dylibbundler`

**Arch Linux:**
`sudo pacman -S sdl2 sdl2_image tbb flac luajit lua minizip lz4 libpng meson ninja base-devel`
Expand Down
2 changes: 1 addition & 1 deletion Source/Managers/WindowMan.cpp
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@ void WindowMan::Initialize() {

SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Are these changes still necessary/valid with the changes in b5b183e?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, that CL is older. No idea why it's merge conflicting, but eh

SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY);
CreatePrimaryWindow();
InitializeOpenGL();
Expand Down
7 changes: 4 additions & 3 deletions meson.build
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,10 +200,11 @@ if host_machine.system() in ['linux','darwin']
dependency('liblz4'),
dependency('libpng'),
dependency('tbb'),
dependency('gl')
]
if host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation'])
if host_machine.system() == 'linux'
deps += dependency('gl')
elif host_machine.system()=='darwin'
deps += dependency('appleframeworks', modules: ['Foundation', 'OpenGL'])
endif
bfd = compiler.find_library('bfd', required: false)
if bfd.found()
Expand Down
Loading