blob: ed007b55729205b9dec8e4be7054ad5ca288e9e4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
diff -Naur 10.25-1/FreeFileSync/Source/Makefile 10.25-2/FreeFileSync/Source/Makefile
--- 10.25-1/FreeFileSync/Source/Makefile 2020-06-20 13:36:08.495867672 -0400
+++ 10.25-2/FreeFileSync/Source/Makefile 2020-06-20 13:31:36.180419862 -0400
@@ -1,4 +1,5 @@
exeName = FreeFileSync
+CXX=g++-10
cxxFlags += -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
@@ -114,11 +115,11 @@
../Build/Bin/$(exeName): $(objFiles)
mkdir -p $(dir $@)
- g++ -o $@ $^ $(linkFlags)
+ $(CXX) -o $@ $^ $(linkFlags)
$(tmpPath)/ffs/src/%.o : %
mkdir -p $(dir $@)
- g++ $(cxxFlags) -c $< -o $@
+ $(CXX) $(cxxFlags) -c $< -o $@
clean:
rm -rf $(tmpPath)
diff -Naur 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 10.25-2/FreeFileSync/Source/RealTimeSync/Makefile
--- 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-06-20 13:36:08.499867723 -0400
+++ 10.25-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-06-20 13:31:48.844580205 -0400
@@ -1,4 +1,5 @@
exeName = RealTimeSync
+CXX=g++-10
cxxFlags += -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \
-Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \
@@ -52,11 +53,11 @@
../../Build/Bin/$(exeName): $(objFiles)
mkdir -p $(dir $@)
- g++ -o $@ $^ $(linkFlags)
+ $(CXX) -o $@ $^ $(linkFlags)
$(tmpPath)/ffs/src/rts/%.o : %
mkdir -p $(dir $@)
- g++ $(cxxFlags) -c $< -o $@
+ $(CXX) $(cxxFlags) -c $< -o $@
clean:
rm -rf $(tmpPath)
|
