brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Really fix windows build

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-04-15 22:16:11 +02:00
parent f1f7d968df
commit a42ca2c5df
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -987,8 +987,8 @@ jobs:
export PATH="/usr/lib/ccache:${PATH}" export PATH="/usr/lib/ccache:${PATH}"
pushd deps/PawPaw; source local.env win32; popd pushd deps/PawPaw; source local.env win32; popd
make carla-win32 -j $(nproc) make carla-win32 -j $(nproc)
make -C carla DGL_NAMESPACE=CardinalDGL EMBED_TARGET=true TESTING=true dist make -C carla EMBED_TARGET=true TESTING=true dist
make -C carla DGL_NAMESPACE=CardinalDGL EMBED_TARGET=true TESTING=true dist make -C carla EMBED_TARGET=true TESTING=true dist
- name: Build win32 cross-compiled (packaging) - name: Build win32 cross-compiled (packaging)
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
run: | run: |
@ -1083,8 +1083,8 @@ jobs:
export PATH="/usr/lib/ccache:${PATH}" export PATH="/usr/lib/ccache:${PATH}"
pushd deps/PawPaw; source local.env win64; popd pushd deps/PawPaw; source local.env win64; popd
make carla-win32 -j $(nproc) make carla-win32 -j $(nproc)
make -C carla DGL_NAMESPACE=CardinalDGL EMBED_TARGET=true TESTING=true dist make -C carla EMBED_TARGET=true TESTING=true dist
make -C carla DGL_NAMESPACE=CardinalDGL EMBED_TARGET=true TESTING=true dist make -C carla EMBED_TARGET=true TESTING=true dist
- name: Build win64 cross-compiled (packaging) - name: Build win64 cross-compiled (packaging)
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
run: | run: |

2
Makefile
View file

@ -172,6 +172,7 @@ ifneq ($(STATIC_BUILD),true)
$(MAKE) all -C carla $(CARLA_EXTRA_ARGS) \ $(MAKE) all -C carla $(CARLA_EXTRA_ARGS) \
CAN_GENERATE_LV2_TTL=false \ CAN_GENERATE_LV2_TTL=false \
CUSTOM_DPF_PATH=$(CURDIR)/dpf \ CUSTOM_DPF_PATH=$(CURDIR)/dpf \
DGL_NAMESPACE=CardinalDGL \
HAVE_FRONTEND=true \ HAVE_FRONTEND=true \
HAVE_PYQT=true \ HAVE_PYQT=true \
HAVE_QT5=true \ HAVE_QT5=true \
@ -182,6 +183,7 @@ ifeq ($(CPU_X86_64),true)
$(MAKE) win32r -C carla $(CARLA_EXTRA_ARGS) \ $(MAKE) win32r -C carla $(CARLA_EXTRA_ARGS) \
CAN_GENERATE_LV2_TTL=false \ CAN_GENERATE_LV2_TTL=false \
CUSTOM_DPF_PATH=$(CURDIR)/dpf \ CUSTOM_DPF_PATH=$(CURDIR)/dpf \
DGL_NAMESPACE=CardinalDGL \
HAVE_FRONTEND=true \ HAVE_FRONTEND=true \
HAVE_PYQT=true \ HAVE_PYQT=true \
HAVE_QT5=true \ HAVE_QT5=true \

2
carla

@ -1 +1 @@
Subproject commit 6f22f09d230236d2a8bbdd662d46146d81b318b1 Subproject commit cf11562c505407f12a6e6d085ca448fefd7399ba