is a program for photo editing and collection management.
| Makefile (fotoxx-23.0) | : | Makefile (fotoxx-23.1) |
|---|
| | |
| skipping to change at line 12 | | skipping to change at line 12 |
|---|
| # | | # |
| # export CXX=g++ gnu compiler | | # export CXX=g++ gnu compiler |
| # export CXX=clang++ clang compiler | | # export CXX=clang++ clang compiler |
| # export DEBUG=x debug build with address checking | | # export DEBUG=x debug build with address checking |
| | |
| # Try to fix warning from champlain-tile.h but none of this works | | # Try to fix warning from champlain-tile.h but none of this works |
| # CXXFLAGS += -D GTimeVal=GDateTime | | # CXXFLAGS += -D GTimeVal=GDateTime |
| # MAKEDIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) | | # MAKEDIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) |
| # CXXFLAGS += -I $(MAKEDIR) | | # CXXFLAGS += -I $(MAKEDIR) |
| | |
|
| | CXXFLAGS += -fpermissive -Wno-write-strings |
| | |
| ifeq ($(CXX), clang++) # CLANG | | ifeq ($(CXX), clang++) # CLANG |
| ifdef DEBUG | | ifdef DEBUG |
| CXXFLAGS += -Wall -g -O0 -fsanitize=address -Wno-stringop-truncation | | CXXFLAGS += -Wall -g -O0 -fsanitize=address -Wno-stringop-truncation |
| LDFLAGS += -fsanitize=address | | LDFLAGS += -fsanitize=address |
| else | | else |
| CXXFLAGS += -Wall -g -O2 | | CXXFLAGS += -Wall -g -O2 |
| endif | | endif |
| else # GCC | | else # GCC |
| ifdef DEBUG | | ifdef DEBUG |
| CXXFLAGS += -Wall -g2 -rdynamic -O0 -fsanitize=address
\ | | CXXFLAGS += -Wall -g2 -rdynamic -O0 -fsanitize=address
\ |
| -Wno-format-truncation -Wno-stringop-truncation | | -Wno-format-truncation -Wno-stringop-truncation |
| LDFLAGS += -fsanitize=address | | LDFLAGS += -fsanitize=address |
| else | | else |
| CXXFLAGS += -Wall -g2 -rdynamic -O2 -Wno-format-truncation -Wno-stringop-t
runcation | | CXXFLAGS += -Wall -g2 -rdynamic -O2 -Wno-format-truncation -Wno-stringop-t
runcation |
| endif | | endif |
| endif | | endif |
| | |
| PKG_CONFIG ?= pkg-config | | PKG_CONFIG ?= pkg-config |
| | |
|
| CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \ | | CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c
\ |
| `$(PKG_CONFIG) --cflags gtk+-3.0 --libs champlain-gtk-0.12` | | `$(PKG_CONFIG) --cflags gtk+-3.0 --libs champlain-gtk-0.12` |
| | |
| LIBS = `$(PKG_CONFIG) --libs gtk+-3.0`
\ | | LIBS = `$(PKG_CONFIG) --libs gtk+-3.0`
\ |
| -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg
\ | | -lrt -lpthread -llcms2 -ltiff -lpng -ljpeg
\ |
| -lclutter-1.0 -lclutter-gtk-1.0 -lchamplain-0.12 -lchamplain-gtk-0.12 | | -lclutter-1.0 -lclutter-gtk-1.0 -lchamplain-0.12 -lchamplain-gtk-0.12 |
| | |
| ALLFILES = fotoxx.o f.widgets.o f.file.o f.gallery.o f.albums.o f.select.o f.met
a.o \ | | ALLFILES = fotoxx.o f.widgets.o f.file.o f.gallery.o f.albums.o f.select.o f.met
a.o \ |
| f.edit.o f.repair.o f.refine.o f.effects.o f.warp.o f.comb.o f.mashup
.o \ | | f.edit.o f.repair.o f.refine.o f.effects.o f.warp.o f.comb.o f.mashup
.o \ |
| f.tools.o f.batch.o f.pixmap.o zfuncs.o | | f.tools.o f.batch.o f.pixmap.o zfuncs.o |
| | |
| | |
| skipping to change at line 97 | | skipping to change at line 99 |
|---|
| f.tools.o: f.tools.cc fotoxx.h | | f.tools.o: f.tools.cc fotoxx.h |
| $(CXX) f.tools.cc $(CFLAGS) \ | | $(CXX) f.tools.cc $(CFLAGS) \ |
| | |
| f.batch.o: f.batch.cc fotoxx.h | | f.batch.o: f.batch.cc fotoxx.h |
| $(CXX) f.batch.cc $(CFLAGS) \ | | $(CXX) f.batch.cc $(CFLAGS) \ |
| | |
| f.pixmap.o: f.pixmap.cc fotoxx.h | | f.pixmap.o: f.pixmap.cc fotoxx.h |
| $(CXX) f.pixmap.cc $(CFLAGS) \ | | $(CXX) f.pixmap.cc $(CFLAGS) \ |
| | |
| zfuncs.o: zfuncs.cc zfuncs.h | | zfuncs.o: zfuncs.cc zfuncs.h |
|
| $(CXX) zfuncs.cc $(CFLAGS) \ | | $(CXX) zfuncs.cc $(CFLAGS) \ |
| | |
| # install application files in standard locations | | # install application files in standard locations |
| PREFIX ?= /usr | | PREFIX ?= /usr |
| BINDIR = $(PREFIX)/bin | | BINDIR = $(PREFIX)/bin |
| DOCDIR = $(PREFIX)/share/doc/fotoxx | | DOCDIR = $(PREFIX)/share/doc/fotoxx |
| MANDIR = $(PREFIX)/share/man/man1 | | MANDIR = $(PREFIX)/share/man/man1 |
| MENUDIR = $(PREFIX)/share/applications | | MENUDIR = $(PREFIX)/share/applications |
| SHAREDIR = $(PREFIX)/share/fotoxx | | SHAREDIR = $(PREFIX)/share/fotoxx |
| DATADIR = $(SHAREDIR)/data | | DATADIR = $(SHAREDIR)/data |
| IMAGEDIR = $(SHAREDIR)/images | | IMAGEDIR = $(SHAREDIR)/images |
| | | |
| End of changes. 3 change blocks. |
|---|
| 2 lines changed or deleted | | 4 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 