# HG changeset patch # User Edouard Tisserant # Date 1652976527 -7200 # Node ID 1a2658f109da9e7940199ccbac9a21e0f411a5eb # Parent bf2341a0e2c68d7986a535ffcf780a154b793e1b windows installer: force CanFestival build to use source code already checked out rather than re-doing it in anotrher directory. diff -r bf2341a0e2c6 -r 1a2658f109da win32.mk --- a/win32.mk Thu May 19 18:05:37 2022 +0200 +++ b/win32.mk Thu May 19 18:08:47 2022 +0200 @@ -5,17 +5,19 @@ ide_targets_from_dist: canfestival touch $@ -CFbuild = installer/CanFestival-3 -canfestival: $(msysdir)/.stamp - rm -rf $(CFbuild) - $(call get_src_hg,$(CFbuild)) - cd $(CFbuild); \ +CanFestival-3_dir = installer/CanFestival-3 +CanFestival-3: $(CanFestival-3_dir)/.stamp +$(CanFestival-3_dir)/.stamp: sources/CanFestival-3_src | installer +canfestival: $(CanFestival-3_dir)/.stamp + rm -rf $(CanFestival-3_dir) + cp -a sources/CanFestival-3 $(CanFestival-3_dir) + cd $(CanFestival-3_dir); \ ./configure --can=tcp_win32 \ --cc=$(CC) \ --cxx=$(CXX) \ --target=win32 \ --wx=0 - $(MAKE) -C $(CFbuild) - cd $(CFbuild); find . -name "*.o" -exec rm {} ';' #remove object files only + $(MAKE) -C $(CanFestival-3_dir) + cd $(CanFestival-3_dir); find . -name "*.o" -exec rm {} ';' #remove object files only touch $@