Merge branch 'release/2.3.1'

naavis · Jul 14, 2019 · 0a5be53 · 0a5be53
2 parents c80ddb0 + 1b984b0
commit 0a5be53
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.3.1 - 2019-07-14
+
+### Fixed
+- Fixed build configuration bug where resources were not being linked on Linux
+
 ## 2.3.0 - 2019-07-13
 
 ### Added
 - Added menu bar with option to save simulation result as image
-- Added slider for setting the probability of double scattering
+- Added slider for setting the probability of simple double scattering
 
 ### Changed
 - Replaced Add Population and Remove Population texts with icons

diff --git a/README.md b/README.md
@@ -43,6 +43,8 @@ Here are some general settings for the whole simulation.
 - **Double scattering:** Probability of a single light ray to scatter from two
   different ice crystals
   - Note that this slows down the simulation significantly!
+  - The current implementation only does double scattering inside one crystal
+    population
   - A value of 0.0 means no rays are scattered twice, and 1.0 means all rays
     are scattered twice
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '2.3.0-{build}'
+version: '2.3.1-{build}'
 branches:
   only:
     - master

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -32,7 +32,7 @@ set(RESOURCE_FILES resources/haloray.qrc resources/haloray.rc)
 IF (WIN32)
     add_executable(haloray WIN32 ${HALORAY_SOURCES} ${RESOURCE_FILES})
 ELSE()
-    add_executable(haloray ${HALORAY_SOURCES})
+    add_executable(haloray ${HALORAY_SOURCES} ${RESOURCE_FILES})
 ENDIF()
 
 target_link_libraries(haloray Qt5::Core Qt5::Widgets Qt5::Gui)