Compare commits
13 Commits
prerelease
...
prerelease
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1a455dbbe | ||
|
|
a81640747d | ||
|
|
4a1ed23f96 | ||
|
|
eb36d02fcb | ||
|
|
7b3a1e1835 | ||
|
|
8e53579682 | ||
|
|
0d8f262185 | ||
|
|
fc6f41d89b | ||
|
|
6a7ce72eb7 | ||
|
|
f84e5429a5 | ||
|
|
f4c7294267 | ||
|
|
be4b04a286 | ||
|
|
9d11122e93 |
20
.github/workflows/release.yml
vendored
20
.github/workflows/release.yml
vendored
@@ -106,7 +106,7 @@ jobs:
|
||||
submodules: recursive
|
||||
|
||||
- name: Install build tools
|
||||
run: choco install winflexbison mingw -y
|
||||
run: choco install winflexbison -y
|
||||
shell: pwsh
|
||||
|
||||
- name: Setup Python
|
||||
@@ -114,23 +114,9 @@ jobs:
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
- name: Install Conan
|
||||
run: |
|
||||
python -m pip install --upgrade pip
|
||||
pip install conan
|
||||
conan profile detect
|
||||
shell: pwsh
|
||||
|
||||
- name: Build with MinGW
|
||||
run: |
|
||||
conan install . `
|
||||
-s compiler=gcc `
|
||||
-s compiler.version=13 `
|
||||
-s compiler.libcxx=libstdc++11 `
|
||||
-s arch=x86_64 `
|
||||
-s os=Windows `
|
||||
--build=missing
|
||||
conan build .
|
||||
make windows
|
||||
shell: pwsh
|
||||
|
||||
- name: Package
|
||||
@@ -139,7 +125,7 @@ jobs:
|
||||
$ARCH = if ([Environment]::Is64BitOperatingSystem) { 'x64' } else { 'x86' }
|
||||
$FOLDER = "chloride-$TAG-windows-$ARCH"
|
||||
$ZIP = "$FOLDER.zip"
|
||||
Rename-Item build\bin $FOLDER
|
||||
Rename-Item bin $FOLDER
|
||||
Copy-Item LICENSE.txt $FOLDER
|
||||
Compress-Archive -Path $FOLDER -DestinationPath $ZIP
|
||||
echo "TAR_NAME=$ZIP" >> $env:GITHUB_ENV
|
||||
|
||||
15
Makefile
15
Makefile
@@ -2,18 +2,29 @@
|
||||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
# Default FLEX tool
|
||||
BINARY = bin/argon
|
||||
FLEX_TOOL = flex
|
||||
|
||||
# If target is "windows", override FLEX_TOOL
|
||||
ifeq ($(MAKECMDGOALS),windows)
|
||||
BINARY = bin/argon.exe
|
||||
FLEX_TOOL = win_flex
|
||||
endif
|
||||
|
||||
LEXER_SRC = src/lexer/lex.l
|
||||
LEXER_C = src/lexer/lex.yy.c
|
||||
LEXER_H = src/lexer/lex.yy.h
|
||||
|
||||
CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
|
||||
CFLAGS = $(ARCHFLAGS) -lm -lgc -lgmp -Wall -Wextra -Wno-unused-function -Werror=unused-result -Iexternal/cwalk/include -Iexternal/libdye/include
|
||||
BINARY = bin/argon
|
||||
|
||||
all: $(BINARY)
|
||||
|
||||
windows: $(BINARY)
|
||||
|
||||
$(LEXER_C) $(LEXER_H): $(LEXER_SRC)
|
||||
flex --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
|
||||
$(FLEX_TOOL) --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
|
||||
|
||||
$(BINARY): $(CFILES) $(LEXER_C) $(LEXER_H)
|
||||
mkdir -p bin
|
||||
|
||||
@@ -30,6 +30,7 @@ class ArgonConan(ConanFile):
|
||||
self.folders.generators = "build"
|
||||
|
||||
def generate(self):
|
||||
os.environ["CONAN_NON_INTERACTIVE"] = "1"
|
||||
tc = CMakeToolchain(self)
|
||||
|
||||
if os.name == "nt": # Windows
|
||||
|
||||
Reference in New Issue
Block a user