From 2c8ee78c4b9c301b14105e5d30920ea813eb50cf Mon Sep 17 00:00:00 2001 From: Ketmar Dark Date: Sun, 30 Jun 2024 20:12:51 +0300 Subject: [PATCH] added "C++FLAGS.all" (and "OBJCFLAGS.all"); "CFLAGS.all" is still in effect --- defaults/build/Jambase.build.cpp | 2 +- defaults/build/Jambase.build.objc | 2 +- defaults/fix/Jambase.fix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/build/Jambase.build.cpp b/defaults/build/Jambase.build.cpp index 0432bef..dd91645 100644 --- a/defaults/build/Jambase.build.cpp +++ b/defaults/build/Jambase.build.cpp @@ -43,5 +43,5 @@ rule C++ { actions C++ { - $(C++) -c -o $(<) $(C++.standard) $(CFLAGS.all) $(C++FLAGS) $(OPTIM.all) $(C++OPTIM) $(CCDEFS) $(CCHDRS) $(>) + $(C++) -c -o $(<) $(C++.standard) $(CFLAGS.all) $(C++FLAGS.all) $(C++FLAGS) $(OPTIM.all) $(C++OPTIM) $(CCDEFS) $(CCHDRS) $(>) } diff --git a/defaults/build/Jambase.build.objc b/defaults/build/Jambase.build.objc index 5b9e3c7..77f2af0 100644 --- a/defaults/build/Jambase.build.objc +++ b/defaults/build/Jambase.build.objc @@ -39,5 +39,5 @@ rule ObjC { } actions ObjC { - $(OBJCC) -c -o $(<) $(CFLAGS.all) $(OBJCFLAGS) $(OPTIM.all) $(OBJCOPTIM) $(CCDEFS) $(CCHDRS) $(>) + $(OBJCC) -c -o $(<) $(CFLAGS.all) $(OBJCFLAGS.all) $(OBJCFLAGS) $(OPTIM.all) $(OBJCOPTIM) $(CCDEFS) $(CCHDRS) $(>) } diff --git a/defaults/fix/Jambase.fix b/defaults/fix/Jambase.fix index 58ed0b8..25d2220 100644 --- a/defaults/fix/Jambase.fix +++ b/defaults/fix/Jambase.fix @@ -43,7 +43,7 @@ if $(NT) { $(CC) -c -o $(<) $(CFLAGS.all) $(CCFLAGS) $(OPTIM.all) $(OPTIM) $(CCDEFS) $(CCHDRS) -I$(STDHDRS) $(>) } actions C++ { - $(C++) -c -o $(<) $(CFLAGS.all) $(C++FLAGS) $(OPTIM.all) $(OPTIM) $(CCDEFS) $(CCHDRS) -I$(STDHDRS) $(>) + $(C++) -c -o $(<) $(CFLAGS.all) $(C++FLAGS) $(C++FLAGS.all) $(OPTIM.all) $(OPTIM) $(CCDEFS) $(CCHDRS) -I$(STDHDRS) $(>) } actions DllLink bind DEFFILENAME IMPLIBNAME { $(LINK) $(LINKFLAGS.all) $(LINKFLAGS) -shared -o $(<) $(>) $(DEFFILENAME) -Wl,--out-implib,$(IMPLIBNAME) $(LINKLIBS.all) $(LINKLIBS) -- 2.11.4.GIT