Skip to content

Commit a14fc4a

Browse files
frabasfrabas
committed
v1.1.1 For Windows
1 parent 96208f6 commit a14fc4a

File tree

4 files changed

+76
-74
lines changed

4 files changed

+76
-74
lines changed

‎COPYRIGHT.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* --------------------------------------------------------------------------
22
* DISPLACE: DYNAMIC INDIVIDUAL VESSEL-BASED SPATIAL PLANNING
33
* AND EFFORT DISPLACEMENT
4-
* Copyright(c) 2012-2021 Francois Bastardie <[email protected]>
4+
* Copyright(c) 2012-2023 Francois Bastardie <[email protected]>
55
*
66
* This program is free software; you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License as published by

‎include/version.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#ifndef VERSION_H
22
#define VERSION_H
33

4-
#define VERSION "1.1"
4+
#define VERSION "1.1.1"
55
#define VERSION_BUILD 0
6-
#define VERSION_COMMA 1,1,0,VERSION_BUILD
6+
#define VERSION_COMMA 1,1,1,VERSION_BUILD
77

8-
#define VER_PRODUCTVERSION_STR "1.1\0"
8+
#define VER_PRODUCTVERSION_STR "1.1.1\0"
99

1010
#define VER_FILEVERSION VERSION_COMMA
1111
#define VER_FILEVERSION_STR VERSION "\0"
@@ -15,7 +15,7 @@
1515
#define VER_COMPANYNAME_STR "Displace-project"
1616
#define VER_FILEDESCRIPTION_STR "DisplaceGui"
1717
#define VER_INTERNALNAME_STR "DisplaceGui.exe"
18-
#define VER_LEGALCOPYRIGHT_STR "Copyright (c) 2012-2022 Francois Bastardie <[email protected]>"
18+
#define VER_LEGALCOPYRIGHT_STR "Copyright (c) 2012-2023 Francois Bastardie <[email protected]>"
1919
#define VER_LEGALTRADEMARKS1_STR "All Rights Reserved"
2020
#define VER_LEGALTRADEMARKS2_STR VER_LEGALTRADEMARKS1_STR
2121
#define VER_ORIGINALFILENAME_STR "displacegui.exe"

‎qtgui/resources/about.txt

+5-16
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Copyright
99
<br/>
1010
<br/>
1111

12-
* DISPLACE: DYNAMIC INDIVIDUAL VESSEL-BASED SPATIAL PLANNING
12+
* DISPLACE: A DYNAMIC INDIVIDUAL VESSEL-BASED SPATIAL PLANNING
1313
* AND EFFORT DISPLACEMENT
1414
<br/>
15-
* Copyright (c) 2012-2021 Francois Bastardie <[email protected]>
15+
* Copyright (c) 2012-2023 Francois Bastardie <[email protected]>
1616
<br/>
1717
*
1818
<br/>
@@ -114,27 +114,16 @@ fish population models. Canadian Journal of Fisheries and Aquatic Sciences. 71(3
114114
Available from: 10.1139/cjfas-2013-0126
115115
<br/>
116116
<br/>
117-
* Bastardie, F., Nielsen, J. R., Eigaard, O. R., Fock, H. O., Jonsson, P., and Bartolino, V. 2014.
118-
Competition for marine space: modelling the Baltic Sea fisheries and effort displacement
119-
under spatial restrictions, ICES Journal of Marine Science, doi: 10.1093/icesjms/fsu215.
120-
<br/>
121-
<br/>
122-
* Bastardie, F., S. Angelini, L. Bolognini, F. Fuga,
123-
C. Manfredi, M. Martinelli, J. R. Nielsen, A. Santojanni, G. Scarcella, and F. Grati. 2017.
124-
Spatial planning for fisheries in the Northern Adriatic:
125-
working toward viable and sustainable fishing. Ecosphere 8(2):e01696.
126-
Developers
127-
<br/>
128-
<br/>
117+
129118

130119
<br/>
131120
============
132121
<br/>
133122
<br/>
134123

135-
* Francois Bastardie (core model)
124+
* Francois Bastardie (core simulation model)
136125
<br/>
137-
* Federico Fuga (user interface)
126+
* Federico Fuga (graphical user interface)
138127

139128
<br/>
140129
<br/>

‎setup.iss

+66-53
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "Displace"
5-
#define MyAppVersion "1.1"
5+
#define MyAppVersion "1.1.1"
66
#define MyAppPublisher "Displace Project"
77
#define MyAppURL "http://www.displace-project.org"
88
#define MyAppExeName "displacegui.exe"
@@ -20,9 +20,9 @@
2020
#if FileExists("local.iss")
2121
#include "local.iss"
2222
#else
23-
#define QT_DIR "C:\Qt\5.15.0\msvc2019_64"
24-
#define QT_PLUGINS_DIR "C:\Qt\5.15.0\msvc2019_64\plugins"
25-
#define SDK_DIR "C:\vcpkg\installed\x64-windows"
23+
#define QT_DIR "C:\Qt\5.15.2\msvc2019_64"
24+
#define QT_PLUGINS_DIR "C:\Qt\5.15.2\msvc2019_64\plugins"
25+
#define SDK_DIR "C:\DISPLACE-vcpkg\installed\x64-windows"
2626
#endif
2727

2828
[Setup]
@@ -90,68 +90,81 @@ Source: "build\x64-Release\bin\qtcommons.dll"; DestDir: "{app}"; Flags: ignoreve
9090

9191
Source: "scripts\gen_ts.R"; DestDir: "{app}\scripts"; Flags: ignoreversion
9292

93-
Source: "{#SDK_DIR}\bin\boost_system-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
94-
Source: "{#SDK_DIR}\bin\boost_atomic-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
95-
Source: "{#SDK_DIR}\bin\boost_chrono-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
96-
Source: "{#SDK_DIR}\bin\boost_container-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
97-
Source: "{#SDK_DIR}\bin\boost_context-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
98-
Source: "{#SDK_DIR}\bin\boost_coroutine-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
99-
Source: "{#SDK_DIR}\bin\boost_date_time-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
100-
Source: "{#SDK_DIR}\bin\boost_filesystem-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
101-
Source: "{#SDK_DIR}\bin\boost_graph-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
102-
Source: "{#SDK_DIR}\bin\boost_iostreams.dll"; DestDir: "{app}"; Flags: ignoreversion
103-
Source: "{#SDK_DIR}\bin\boost_locale-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
104-
Source: "{#SDK_DIR}\bin\boost_log_setup-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
105-
Source: "{#SDK_DIR}\bin\boost_log-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
106-
Source: "{#SDK_DIR}\bin\boost_math_c99f-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
107-
Source: "{#SDK_DIR}\bin\boost_math_c99l-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
108-
Source: "{#SDK_DIR}\bin\boost_math_c99-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
109-
Source: "{#SDK_DIR}\bin\boost_math_tr1f-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
110-
Source: "{#SDK_DIR}\bin\boost_math_tr1l-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
111-
Source: "{#SDK_DIR}\bin\boost_math_tr1-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
112-
Source: "{#SDK_DIR}\bin\boost_prg_exec_monitor-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
113-
Source: "{#SDK_DIR}\bin\boost_program_options-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
114-
Source: "{#SDK_DIR}\bin\boost_random-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
115-
Source: "{#SDK_DIR}\bin\boost_regex-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
116-
Source: "{#SDK_DIR}\bin\boost_system-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
117-
Source: "{#SDK_DIR}\bin\boost_thread-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
118-
;Source: "{#SDK_DIR}\bin\boost_timer-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
119-
Source: "{#SDK_DIR}\bin\boost_unit_test_framework-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
120-
Source: "{#SDK_DIR}\bin\boost_serialization-vc142-mt-x64-1_71.dll"; DestDir: "{app}"; Flags: ignoreversion
121-
122-
;Source: "{#SDK_DIR}\bin\CGAL_Core-vc140-mt-4.13-I-900.dll"; DestDir: "{app}"; Flags: ignoreversion
123-
;Source: "{#SDK_DIR}\bin\CGAL_ImageIO-vc140-mt-4.13-I-900.dll"; DestDir: "{app}"; Flags: ignoreversion
124-
;Source: "{#SDK_DIR}\bin\CGAL-vc140-mt-4.13-I-900.dll"; DestDir: "{app}"; Flags: ignoreversion
125-
Source: "{#SDK_DIR}\bin\expat.dll"; DestDir: "{app}"; Flags: ignoreversion
126-
Source: "{#SDK_DIR}\bin\gdal204.dll"; DestDir: "{app}"; Flags: ignoreversion
127-
Source: "{#SDK_DIR}\bin\Geographic.dll"; DestDir: "{app}"; Flags: ignoreversion
93+
Source: "{#SDK_DIR}\bin\boost_system-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
94+
Source: "{#SDK_DIR}\bin\boost_atomic-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
95+
Source: "{#SDK_DIR}\bin\boost_chrono-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
96+
Source: "{#SDK_DIR}\bin\boost_container-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
97+
Source: "{#SDK_DIR}\bin\boost_context-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
98+
Source: "{#SDK_DIR}\bin\boost_coroutine-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
99+
Source: "{#SDK_DIR}\bin\boost_date_time-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
100+
Source: "{#SDK_DIR}\bin\boost_filesystem-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
101+
Source: "{#SDK_DIR}\bin\boost_graph-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
102+
Source: "{#SDK_DIR}\bin\boost_iostreams-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
103+
;Source: "{#SDK_DIR}\bin\boost_locale-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
104+
Source: "{#SDK_DIR}\bin\boost_log_setup-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
105+
Source: "{#SDK_DIR}\bin\boost_log-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
106+
Source: "{#SDK_DIR}\bin\boost_math_c99f-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
107+
Source: "{#SDK_DIR}\bin\boost_math_c99l-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
108+
Source: "{#SDK_DIR}\bin\boost_math_c99-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
109+
Source: "{#SDK_DIR}\bin\boost_math_tr1f-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
110+
Source: "{#SDK_DIR}\bin\boost_math_tr1l-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
111+
Source: "{#SDK_DIR}\bin\boost_math_tr1-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
112+
Source: "{#SDK_DIR}\bin\boost_prg_exec_monitor-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
113+
Source: "{#SDK_DIR}\bin\boost_program_options-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
114+
Source: "{#SDK_DIR}\bin\boost_random-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
115+
Source: "{#SDK_DIR}\bin\boost_regex-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
116+
Source: "{#SDK_DIR}\bin\boost_system-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
117+
Source: "{#SDK_DIR}\bin\boost_thread-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
118+
Source: "{#SDK_DIR}\bin\boost_unit_test_framework-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
119+
Source: "{#SDK_DIR}\bin\boost_serialization-vc142-mt-x64-1_79.dll"; DestDir: "{app}"; Flags: ignoreversion
120+
121+
;Source: "{#SDK_DIR}\bin\expat.dll"; DestDir: "{app}"; Flags: ignoreversion
122+
Source: "{#SDK_DIR}\bin\libexpat.dll"; DestDir: "{app}"; Flags: ignoreversion
123+
;Source: "{#SDK_DIR}\bin\gdal204.dll"; DestDir: "{app}"; Flags: ignoreversion
124+
Source: "{#SDK_DIR}\bin\gdal.dll"; DestDir: "{app}"; Flags: ignoreversion
125+
;Source: "{#SDK_DIR}\bin\Geographic.dll"; DestDir: "{app}"; Flags: ignoreversion
126+
Source: "{#SDK_DIR}\bin\GeographicLib.dll"; DestDir: "{app}"; Flags: ignoreversion
128127
Source: "{#SDK_DIR}\bin\geos.dll"; DestDir: "{app}"; Flags: ignoreversion
129128
Source: "{#SDK_DIR}\bin\geos_c.dll"; DestDir: "{app}"; Flags: ignoreversion
130129

131-
;Source: "{#SDK_DIR}\bin\icudt61.dll"; DestDir: "{app}"; Flags: ignoreversion
132-
;Source: "{#SDK_DIR}\bin\icuio61.dll"; DestDir: "{app}"; Flags: ignoreversion
133-
;Source: "{#SDK_DIR}\bin\icutu61.dll"; DestDir: "{app}"; Flags: ignoreversion
134-
;Source: "{#SDK_DIR}\bin\icuuc61.dll"; DestDir: "{app}"; Flags: ignoreversion
135-
;Source: "{#SDK_DIR}\bin\libbz2.dll"; DestDir: "{app}"; Flags: ignoreversion
136-
Source: "{#SDK_DIR}\bin\libcharset.dll"; DestDir: "{app}"; Flags: ignoreversion
130+
Source: "{#SDK_DIR}\bin\gmp-10.dll"; DestDir: "{app}"; Flags: ignoreversion
131+
Source: "{#SDK_DIR}\bin\libcrypto-3-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
132+
Source: "{#SDK_DIR}\bin\libssl-3-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
133+
Source: "{#SDK_DIR}\bin\liblzma.dll"; DestDir: "{app}"; Flags: ignoreversion
134+
Source: "{#SDK_DIR}\bin\qhull_r.dll"; DestDir: "{app}"; Flags: ignoreversion
135+
Source: "{#SDK_DIR}\bin\jpeg62.dll"; DestDir: "{app}"; Flags: ignoreversion
136+
Source: "{#SDK_DIR}\bin\tiff.dll"; DestDir: "{app}"; Flags: ignoreversion
137+
Source: "{#SDK_DIR}\bin\geotiff.dll"; DestDir: "{app}"; Flags: ignoreversion
138+
Source: "{#SDK_DIR}\bin\zstd.dll"; DestDir: "{app}"; Flags: ignoreversion
139+
Source: "{#SDK_DIR}\bin\gif.dll"; DestDir: "{app}"; Flags: ignoreversion
140+
Source: "{#SDK_DIR}\bin\netcdf.dll"; DestDir: "{app}"; Flags: ignoreversion
141+
Source: "{#SDK_DIR}\bin\pcre2-8.dll"; DestDir: "{app}"; Flags: ignoreversion
142+
Source: "{#SDK_DIR}\bin\json-c.dll"; DestDir: "{app}"; Flags: ignoreversion
143+
Source: "{#SDK_DIR}\bin\iconv-2.dll"; DestDir: "{app}"; Flags: ignoreversion
144+
Source: "{#SDK_DIR}\bin\hdf5.dll"; DestDir: "{app}"; Flags: ignoreversion
145+
Source: "{#SDK_DIR}\bin\spatialite.dll"; DestDir: "{app}"; Flags: ignoreversion
146+
Source: "{#SDK_DIR}\bin\hdf5_hl.dll"; DestDir: "{app}"; Flags: ignoreversion
147+
Source: "{#SDK_DIR}\bin\freexl.dll"; DestDir: "{app}"; Flags: ignoreversion
148+
149+
150+
;Source: "{#SDK_DIR}\bin\libcharset.dll"; DestDir: "{app}"; Flags: ignoreversion
137151
Source: "{#SDK_DIR}\bin\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion
138-
Source: "{#SDK_DIR}\bin\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion
139-
Source: "{#SDK_DIR}\bin\libiconv.dll"; DestDir: "{app}"; Flags: ignoreversion
140-
;Source: "{#SDK_DIR}\bin\libmysql.dll"; DestDir: "{app}"; Flags: ignoreversion
152+
;Source: "{#SDK_DIR}\bin\libeay32.dll"; DestDir: "{app}"; Flags: ignoreversion
153+
;Source: "{#SDK_DIR}\bin\libiconv.dll"; DestDir: "{app}"; Flags: ignoreversion
141154
Source: "{#SDK_DIR}\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion
142155
Source: "{#SDK_DIR}\bin\libpq.dll"; DestDir: "{app}"; Flags: ignoreversion
143156
Source: "{#SDK_DIR}\bin\libxml2.dll"; DestDir: "{app}"; Flags: ignoreversion
144-
;Source: "{#SDK_DIR}\bin\lz4.dll"; DestDir: "{app}"; Flags: ignoreversion
145-
Source: "{#SDK_DIR}\bin\lzma.dll"; DestDir: "{app}"; Flags: ignoreversion
157+
;Source: "{#SDK_DIR}\bin\lzma.dll"; DestDir: "{app}"; Flags: ignoreversion
146158

147-
Source: "{#SDK_DIR}\bin\mpfr.dll"; DestDir: "{app}"; Flags: ignoreversion
148-
Source: "{#SDK_DIR}\bin\mpir.dll"; DestDir: "{app}"; Flags: ignoreversion
159+
;Source: "{#SDK_DIR}\bin\mpfr.dll"; DestDir: "{app}"; Flags: ignoreversion
160+
Source: "{#SDK_DIR}\bin\mpfr-6.dll"; DestDir: "{app}"; Flags: ignoreversion
161+
;Source: "{#SDK_DIR}\bin\mpir.dll"; DestDir: "{app}"; Flags: ignoreversion
149162

150163
Source: "{#SDK_DIR}\bin\msqlitecpp.dll"; DestDir: "{app}"; Flags: ignoreversion
151164
Source: "{#SDK_DIR}\bin\openjp2.dll"; DestDir: "{app}"; Flags: ignoreversion
152165
Source: "{#SDK_DIR}\bin\proj.dll"; DestDir: "{app}"; Flags: ignoreversion
153166
Source: "{#SDK_DIR}\bin\sqlite3.dll"; DestDir: "{app}"; Flags: ignoreversion
154-
Source: "{#SDK_DIR}\bin\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion
167+
;Source: "{#SDK_DIR}\bin\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion
155168
Source: "{#SDK_DIR}\bin\webp.dll"; DestDir: "{app}"; Flags: ignoreversion
156169
Source: "{#SDK_DIR}\bin\webpdecoder.dll"; DestDir: "{app}"; Flags: ignoreversion
157170
Source: "{#SDK_DIR}\bin\webpdemux.dll"; DestDir: "{app}"; Flags: ignoreversion

0 commit comments

Comments
 (0)