Skip to content

Commit

Permalink
- Toolbar width adaptation
Browse files Browse the repository at this point in the history 
- Fix bug with ListCtrlResize
- Updated installer : admin privileges are no more required
- Moved to Visual Studio 2019 and vcpkg for Windows build
  • Loading branch information
@rpeyron
rpeyron committed May 9, 2020
1 parent fae85b9 commit 140a0ac
Show file tree
Hide file tree
Showing 62 changed files with 7,011 additions and 5,761 deletions.
1,108 changes: 554 additions & 554 deletions ABOUT-NLS
View file

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
2019/01/06 18h45 remi 0.4.5
2020-05-09 15:08 remi 0.4.5
* Toolbar width adaptation
* Fix bug with ListCtrlResize
* Updated installer : admin privileges are no more required
* Moved to Visual Studio 2019 and vcpkg for Windows build

2019-01-06 18h45 remi 0.4.5-beta1
* Fixed GTK3 not working wxINVERT
* Fixed scrolling problems with wxRectTracker and wxLineTracker
* Fixed typo in jhead error message
Expand Down
72 changes: 38 additions & 34 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,40 +8,44 @@ EXTRA_DIST = config.rpath config.rpath m4/ChangeLog config.rpath m4/ChangeLog
NEWS \
TODO \
TODO \
build/win32/upx_compress.bat \
build/win32/RPhoto.iss \
build/win32/make_zip.bat \
build/win32/make_wxRectTracker_zip.bat \
build/dev-cpp/.cvsignore \
build/dev-cpp/RPhoto_private.h \
build/dev-cpp/RPhoto_private.res \
build/dev-cpp/RPhoto.layout \
build/dev-cpp/RPhoto_private.rc \
build/dev-cpp/classfolders.dcf \
build/dev-cpp/RPhoto.ico \
build/dev-cpp/Makefile.win \
build/dev-cpp/RPhoto.dev \
build/vc/RPhoto.dsp \
build/vc/RPhoto.dsw \
build/vc/.cvsignore \
build/vc/upx_compress.bat \
build/vc/RPhoto.vcproj \
build/vc/RPhoto.vcxproj \
build/vc/RPhoto.iss \
build/vc/RPhoto.sln \
build/vc/jpeg6bcrop.dsp \
build/vc/make_zip.bat \
build/vc/make_wxRectTracker_zip.bat \
build/vc/wxVillaLib.dsp \
build/vc2013/RPhoto.vcxproj \
build/vc2013/RPhoto.sln \
build/vc2013/RPhoto.vcxproj.filters \
build/vc2017/RPhoto.vcxproj \
build/vc2017/RPhoto.sln \
build/vc2017/RPhoto.vcxproj.filters \
build/vc2017/wxWidgets.props \
build/vc2017/wxWidgets30.props \
build/snap/snapcraft.xml \
.snapcraft.yaml \
build/win32/upx_compress.bat \
build/win32/RPhoto.iss \
build/win32/make_zip.bat \
build/win32/make_wxRectTracker_zip.bat \
build/dev-cpp/.cvsignore \
build/dev-cpp/RPhoto_private.h \
build/dev-cpp/RPhoto_private.res \
build/dev-cpp/RPhoto.layout \
build/dev-cpp/RPhoto_private.rc \
build/dev-cpp/classfolders.dcf \
build/dev-cpp/RPhoto.ico \
build/dev-cpp/Makefile.win \
build/dev-cpp/RPhoto.dev \
build/vc/RPhoto.dsp \
build/vc/RPhoto.dsw \
build/vc/.cvsignore \
build/vc/upx_compress.bat \
build/vc/RPhoto.vcproj \
build/vc/RPhoto.vcxproj \
build/vc/RPhoto.iss \
build/vc/RPhoto.sln \
build/vc/jpeg6bcrop.dsp \
build/vc/make_zip.bat \
build/vc/make_wxRectTracker_zip.bat \
build/vc/wxVillaLib.dsp \
build/vc2013/RPhoto.vcxproj \
build/vc2013/RPhoto.sln \
build/vc2013/RPhoto.vcxproj.filters \
build/vc2017/RPhoto.vcxproj \
build/vc2017/RPhoto.sln \
build/vc2017/RPhoto.vcxproj.filters \
build/vc2017/wxWidgets.props \
build/vc2017/wxWidgets30.props \
build/vc2019/RPhoto.vcxproj \
build/vc2019/RPhoto.sln \
build/vc2019/RPhoto.vcxproj.filters \
build/vc2019/clean.bat \
build/debian/rules \
build/debian/RPhoto.1 \
build/debian/conffiles \
Expand Down
95 changes: 51 additions & 44 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -138,7 +138,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
Expand Down Expand Up @@ -354,40 +354,44 @@ EXTRA_DIST = config.rpath config.rpath m4/ChangeLog config.rpath m4/ChangeLog
NEWS \
TODO \
TODO \
build/win32/upx_compress.bat \
build/win32/RPhoto.iss \
build/win32/make_zip.bat \
build/win32/make_wxRectTracker_zip.bat \
build/dev-cpp/.cvsignore \
build/dev-cpp/RPhoto_private.h \
build/dev-cpp/RPhoto_private.res \
build/dev-cpp/RPhoto.layout \
build/dev-cpp/RPhoto_private.rc \
build/dev-cpp/classfolders.dcf \
build/dev-cpp/RPhoto.ico \
build/dev-cpp/Makefile.win \
build/dev-cpp/RPhoto.dev \
build/vc/RPhoto.dsp \
build/vc/RPhoto.dsw \
build/vc/.cvsignore \
build/vc/upx_compress.bat \
build/vc/RPhoto.vcproj \
build/vc/RPhoto.vcxproj \
build/vc/RPhoto.iss \
build/vc/RPhoto.sln \
build/vc/jpeg6bcrop.dsp \
build/vc/make_zip.bat \
build/vc/make_wxRectTracker_zip.bat \
build/vc/wxVillaLib.dsp \
build/vc2013/RPhoto.vcxproj \
build/vc2013/RPhoto.sln \
build/vc2013/RPhoto.vcxproj.filters \
build/vc2017/RPhoto.vcxproj \
build/vc2017/RPhoto.sln \
build/vc2017/RPhoto.vcxproj.filters \
build/vc2017/wxWidgets.props \
build/vc2017/wxWidgets30.props \
build/snap/snapcraft.xml \
.snapcraft.yaml \
build/win32/upx_compress.bat \
build/win32/RPhoto.iss \
build/win32/make_zip.bat \
build/win32/make_wxRectTracker_zip.bat \
build/dev-cpp/.cvsignore \
build/dev-cpp/RPhoto_private.h \
build/dev-cpp/RPhoto_private.res \
build/dev-cpp/RPhoto.layout \
build/dev-cpp/RPhoto_private.rc \
build/dev-cpp/classfolders.dcf \
build/dev-cpp/RPhoto.ico \
build/dev-cpp/Makefile.win \
build/dev-cpp/RPhoto.dev \
build/vc/RPhoto.dsp \
build/vc/RPhoto.dsw \
build/vc/.cvsignore \
build/vc/upx_compress.bat \
build/vc/RPhoto.vcproj \
build/vc/RPhoto.vcxproj \
build/vc/RPhoto.iss \
build/vc/RPhoto.sln \
build/vc/jpeg6bcrop.dsp \
build/vc/make_zip.bat \
build/vc/make_wxRectTracker_zip.bat \
build/vc/wxVillaLib.dsp \
build/vc2013/RPhoto.vcxproj \
build/vc2013/RPhoto.sln \
build/vc2013/RPhoto.vcxproj.filters \
build/vc2017/RPhoto.vcxproj \
build/vc2017/RPhoto.sln \
build/vc2017/RPhoto.vcxproj.filters \
build/vc2017/wxWidgets.props \
build/vc2017/wxWidgets30.props \
build/vc2019/RPhoto.vcxproj \
build/vc2019/RPhoto.sln \
build/vc2019/RPhoto.vcxproj.filters \
build/vc2019/clean.bat \
build/debian/rules \
build/debian/RPhoto.1 \
build/debian/conffiles \
Expand Down Expand Up @@ -433,8 +437,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;

$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
Expand Down Expand Up @@ -552,7 +556,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am

distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Expand Down Expand Up @@ -617,7 +624,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)

dist-bzip2: distdir
Expand All @@ -643,7 +650,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)

dist-zip: distdir
Expand All @@ -661,7 +668,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
Expand All @@ -671,7 +678,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Expand Down
7 changes: 7 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ sudo apt-get install libwxgtk3.0-0v5 libexif12 libjpeg-progs jhead
Windows Build is done with Visual Studio Community Edition.
Please use the latest version in build/ (older vc version are not maintained)

Starting with vc2019, dependancies may be managed with vcpkg :
```
vcpkg integrate install
vcpkg --triplet x86-windows-static install wxwidgets
vcpkg --triplet x86-windows-static install libexif
```


# Contributing

Expand Down
Loading

0 comments on commit 140a0ac

Please sign in to comment.