diff options
| author | B Stack <bgstack15@gmail.com> | 2018-11-17 19:29:15 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-11-17 19:29:15 +0000 |
| commit | 80aefb756e789203ed65bca896f6933c2e1b4ddd (patch) | |
| tree | 1636fa457366aa50ea953a938c201e6c4ad8e3d3 /freefilesync/ffs_makefile.patch | |
| parent | Merge branch 'palemoon-28.2.0' into 'master' (diff) | |
| parent | fix getresourcedir casing (diff) | |
| download | stackrpms-80aefb756e789203ed65bca896f6933c2e1b4ddd.tar.gz stackrpms-80aefb756e789203ed65bca896f6933c2e1b4ddd.tar.bz2 stackrpms-80aefb756e789203ed65bca896f6933c2e1b4ddd.zip | |
Merge branch 'freefilesync-bump' into 'master'
freefilesync 10.6
See merge request bgstack15/stackrpms!16
Diffstat (limited to 'freefilesync/ffs_makefile.patch')
| -rw-r--r-- | freefilesync/ffs_makefile.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/freefilesync/ffs_makefile.patch b/freefilesync/ffs_makefile.patch new file mode 100644 index 0000000..b3ff7ff --- /dev/null +++ b/freefilesync/ffs_makefile.patch @@ -0,0 +1,32 @@ +diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/Makefile 10.3-2/FreeFileSync/Source/Makefile +--- 10.3-0/FreeFileSync/Source/Makefile 2018-08-07 05:03:33.000000000 -0400 ++++ 10.3-2/FreeFileSync/Source/Makefile 2018-08-15 22:25:06.694355202 -0400 +@@ -9,7 +9,7 @@ + -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ + -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread + +-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread ++LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread + + #Gtk - support recycler/icon loading/no button border/grid scrolling + CXXFLAGS += `pkg-config --cflags gtk+-2.0` +@@ -101,6 +101,7 @@ + all: ../Build/Bin/$(APPNAME) + + ../Build/Bin/$(APPNAME): $(OBJ_FILES) ++ mkdir -p ../Build/Bin + g++ -o $@ $^ $(LINKFLAGS) + + ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : % +diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile +--- 10.3-0/FreeFileSync/Source/RealTimeSync/Makefile 2018-08-07 05:03:33.000000000 -0400 ++++ 10.3-2/FreeFileSync/Source/RealTimeSync/Makefile 2018-08-15 22:25:15.968461418 -0400 +@@ -6,7 +6,7 @@ + -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ + -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread + +-LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -pthread ++LINKFLAGS = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread + + #Gtk - support "no button border" + CXXFLAGS += `pkg-config --cflags gtk+-2.0` |