Skip to content

Commit 0d06beb

Browse files
falkTXfalkTX
committed
Enable all the builds again
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 3c36280 commit 0d06beb

5 files changed

Lines changed: 57 additions & 36 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -305,30 +305,32 @@ jobs:
305305
submodules: recursive
306306
- name: Set up cache
307307
uses: actions/cache@v2
308+
id: mpb-cache
308309
with:
309310
path: |
310311
~/mod-workdir
311312
key: modduo-static-v${{ env.CACHE_VERSION }}
312313
- name: Set up dependencies
313314
run: |
314315
sudo apt-get update -qq
315-
sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python libtool-bin
316+
sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python libtool-bin liblo-dev
316317
- name: Bootstrap toolchain
318+
if: steps.mpb-cache.outputs.cache-hit != 'true'
317319
run: |
318320
git clone --depth=1 https://github.com/moddevices/mod-plugin-builder.git deps/mod-plugin-builder
319321
sed -i "s/CT_LOG_PROGRESS_BAR=y/CT_LOG_PROGRESS_BAR=n/" deps/mod-plugin-builder/toolchain/*.config
320322
$(pwd)/deps/mod-plugin-builder/bootstrap.sh modduo-static minimal && $(pwd)/deps/mod-plugin-builder/.clean-install.sh modduo-static
321-
#- name: Build for modduo
322-
#run: |
323-
#CFLAGS="-ffat-lto-objects" CXXFLAGS="-ffat-lto-objects" make modduo HAVE_LIBLO=true HEADLESS=true WITH_LTO=true -j $(nproc)
324-
#- name: Pack binaries
325-
#run: |
326-
#tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-modduo-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep lv2)
327-
#- uses: actions/upload-artifact@v2
328-
#with:
329-
#name: ${{ github.event.repository.name }}-modduo-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
330-
#path: |
331-
#*.tar.gz
323+
- name: Build for modduo
324+
run: |
325+
make modduo HEADLESS=true WITH_LTO=true -j $(nproc)
326+
- name: Pack binaries
327+
run: |
328+
tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-modduo-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep lv2)
329+
- uses: actions/upload-artifact@v2
330+
with:
331+
name: ${{ github.event.repository.name }}-modduo-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
332+
path: |
333+
*.tar.gz
332334
333335
modduox:
334336
runs-on: ubuntu-20.04
@@ -338,30 +340,32 @@ jobs:
338340
submodules: recursive
339341
- name: Set up cache
340342
uses: actions/cache@v2
343+
id: mpb-cache
341344
with:
342345
path: |
343346
~/mod-workdir
344347
key: modduox-v${{ env.CACHE_VERSION }}
345348
- name: Set up dependencies
346349
run: |
347350
sudo apt-get update -qq
348-
sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python libtool-bin
351+
sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python libtool-bin liblo-dev
349352
- name: Bootstrap toolchain
353+
if: steps.mpb-cache.outputs.cache-hit != 'true'
350354
run: |
351355
git clone --depth=1 https://github.com/moddevices/mod-plugin-builder.git deps/mod-plugin-builder
352356
sed -i "s/CT_LOG_PROGRESS_BAR=y/CT_LOG_PROGRESS_BAR=n/" deps/mod-plugin-builder/toolchain/*.config
353357
$(pwd)/deps/mod-plugin-builder/bootstrap.sh modduox-static minimal && $(pwd)/deps/mod-plugin-builder/.clean-install.sh modduox-static
354-
#- name: Build for modduox
355-
#run: |
356-
#CFLAGS="-ffat-lto-objects" CXXFLAGS="-ffat-lto-objects" make modduox HAVE_LIBLO=true HEADLESS=true WITH_LTO=true -j $(nproc)
357-
#- name: Pack binaries
358-
#run: |
359-
#tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-modduox-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep lv2)
360-
#- uses: actions/upload-artifact@v2
361-
#with:
362-
#name: ${{ github.event.repository.name }}-modduox-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
363-
#path: |
364-
#*.tar.gz
358+
- name: Build for modduox
359+
run: |
360+
make modduox HEADLESS=true WITH_LTO=true -j $(nproc)
361+
- name: Pack binaries
362+
run: |
363+
tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-modduox-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep lv2)
364+
- uses: actions/upload-artifact@v2
365+
with:
366+
name: ${{ github.event.repository.name }}-modduox-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
367+
path: |
368+
*.tar.gz
365369
366370
moddwarf:
367371
runs-on: ubuntu-20.04
@@ -371,30 +375,32 @@ jobs:
371375
submodules: recursive
372376
- name: Set up cache
373377
uses: actions/cache@v2
378+
id: mpb-cache
374379
with:
375380
path: |
376381
~/mod-workdir
377382
key: moddwarf-v${{ env.CACHE_VERSION }}
378383
- name: Set up dependencies
379384
run: |
380385
sudo apt-get update -qq
381-
sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python libtool-bin
386+
sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python libtool-bin liblo-dev
382387
- name: Bootstrap toolchain
388+
if: steps.mpb-cache.outputs.cache-hit != 'true'
383389
run: |
384390
git clone --depth=1 https://github.com/moddevices/mod-plugin-builder.git deps/mod-plugin-builder
385391
sed -i "s/CT_LOG_PROGRESS_BAR=y/CT_LOG_PROGRESS_BAR=n/" deps/mod-plugin-builder/toolchain/*.config
386392
$(pwd)/deps/mod-plugin-builder/bootstrap.sh moddwarf minimal && $(pwd)/deps/mod-plugin-builder/.clean-install.sh moddwarf
387-
#- name: Build for moddwarf
388-
#run: |
389-
#CFLAGS="-ffat-lto-objects" CXXFLAGS="-ffat-lto-objects" make moddwarf HAVE_LIBLO=true HEADLESS=true WITH_LTO=true -j $(nproc)
390-
#- name: Pack binaries
391-
#run: |
392-
#tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-moddwarf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep lv2)
393-
#- uses: actions/upload-artifact@v2
394-
#with:
395-
#name: ${{ github.event.repository.name }}-moddwarf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
396-
#path: |
397-
#*.tar.gz
393+
- name: Build for moddwarf
394+
run: |
395+
make moddwarf HEADLESS=true WITH_LTO=true -j $(nproc)
396+
- name: Pack binaries
397+
run: |
398+
tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-moddwarf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}.tar.gz -C bin $(ls bin | grep lv2)
399+
- uses: actions/upload-artifact@v2
400+
with:
401+
name: ${{ github.event.repository.name }}-moddwarf-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
402+
path: |
403+
*.tar.gz
398404
399405
win32:
400406
runs-on: ubuntu-20.04

‎deps/Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ BASE_FLAGS += -DZSTDLIB_VISIBILITY=
1818
BASE_FLAGS += -I../include
1919
BASE_FLAGS += -I../include/neon-compat
2020

21+
ifeq ($(HEADLESS),true)
22+
ifeq ($(WITH_LTO),true)
23+
BASE_FLAGS += -ffat-lto-objects
24+
endif
25+
endif
26+
2127
ifeq ($(WASM),true)
2228
BASE_FLAGS += -msse -msse2 -msse3 -msimd128
2329
else

‎plugins/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,9 @@ endif
748748

749749
ifeq ($(HEADLESS),true)
750750
BASE_FLAGS += -DHEADLESS
751+
ifeq ($(WITH_LTO),true)
752+
BASE_FLAGS += -ffat-lto-objects
753+
endif
751754
endif
752755

753756
ifeq ($(WASM),true)

‎src/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ endif
6262

6363
ifeq ($(HEADLESS),true)
6464
BASE_FLAGS += -DHEADLESS
65+
ifeq ($(WITH_LTO),true)
66+
BASE_FLAGS += -ffat-lto-objects
67+
endif
6568
endif
6669

6770
ifeq ($(WASM),true)

‎src/Makefile.cardinal.mk‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ BASE_FLAGS += -pthread
159159

160160
ifeq ($(HEADLESS),true)
161161
BASE_FLAGS += -DHEADLESS
162+
ifeq ($(WITH_LTO),true)
163+
BASE_FLAGS += -ffat-lto-objects
164+
endif
162165
endif
163166

164167
ifeq ($(WASM),true)

0 commit comments

Comments
 (0)