[glibmm] NMake Makefiles: Fix builds from Meson tarball
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] NMake Makefiles: Fix builds from Meson tarball
- Date: Wed, 11 Mar 2020 15:42:21 +0000 (UTC)
commit 424fa286497d9c70c2c6d08b3f4db83fdf3f86c5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Mar 11 23:39:30 2020 +0800
NMake Makefiles: Fix builds from Meson tarball
For the glib/src/*.[c|h].m4 sources, look also for the generated sources
that are in untracked/glib/glibmm, so that we do not needlessly try to
generate that file, meaning m4 will be required even in release tarballs.
Somehow this did not make it into master but is in glibmm-2-62... :|
MSVC_NMake/build-rules-msvc.mak | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/MSVC_NMake/build-rules-msvc.mak b/MSVC_NMake/build-rules-msvc.mak
index 52d1ca55..3639e55d 100644
--- a/MSVC_NMake/build-rules-msvc.mak
+++ b/MSVC_NMake/build-rules-msvc.mak
@@ -30,8 +30,9 @@ $<
{..\glib\src\}.cc.m4{vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\}.obj:
@if not exist $(@D)\ $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
- @for %%s in ($(<D)\*.cc.m4 $(<D)\*.h.m4) do @if not exist ..\glib\glibmm\%%~ns if not exist
$(@D)\%%~ns $(M4) -I$(<D:\=/) %%s $(<D:\=/)/template.macros.m4 > $(@D)\%%~ns
+ @for %%s in ($(<D)\*.cc.m4 $(<D)\*.h.m4) do @if not exist ..\glib\glibmm\%%~ns if not exist
..\untracked\glib\glibmm\%%~ns if not exist $(@D)\%%~ns $(M4) -I$(<D:\=/) %%s $(<D:\=/)/template.macros.m4 >
$(@D)\%%~ns
@if exist $(@D)\$(<B) $(CXX) $(LIBGLIBMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c $(@D)\$(<B)
+ @if exist ..\untracked\glib\glibmm\$(<B) $(CXX) $(LIBGLIBMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\
/Fd$(@D)\ /c ..\untracked\glib\glibmm\$(<B)
@if exist ..\glib\glibmm\$(<B) $(CXX) $(LIBGLIBMM_CFLAGS) $(CFLAGS_NOGL) /Fo$(@D)\ /Fd$(@D)\ /c
..\glib\glibmm\$(<B)
{..\glib\src\}.ccg{vs$(VSVER)\$(CFG)\$(PLAT)\glibmm\}.obj:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]