Build system updates

KAHR-Alpha · Dec 26, 2023 · 11598ba · 11598ba
1 parent 05f37e3
commit 11598ba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/Ubuntu Dependencies.yml b/.github/workflows/Ubuntu Dependencies.yml
@@ -88,10 +88,10 @@ jobs:
           path: builds/zlib
           key: ${{ runner.os }}-cache-key-zlib
 
-      - run: wget https://zlib.net/zlib-1.2.13.tar.gz
-      - run: tar -xzf zlib-1.2.13.tar.gz
+      - run: wget https://zlib.net/zlib-1.3.tar.gz
+      - run: tar -xzf zlib-1.3.tar.gz
       - run: |
-          cd zlib-1.2.13
+          cd zlib-1.3
           cmake -B ${{github.workspace}}/build -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/builds/zlib -DCMAKE_BUILD_TYPE=Release
           cd ${{github.workspace}}/build
           make

diff --git a/.github/workflows/Windows - Aether Build.yml b/.github/workflows/Windows - Aether Build.yml
@@ -67,7 +67,7 @@ jobs:
       - name: Install NSIS
         uses: repolevedavaj/install-nsis@v1.0.0
         with:
-          nsis-version: 3.08
+          nsis-version: 3.09
 
       - name: Configure CMake
         run: cmake -B "${{github.workspace}}/cmake_build" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DINSTALL_PATH="Aether" -DTASK="Build CLI+GUI" -DEIGEN3_INCLUDE_DIR="${{github.workspace}}/builds/eigen/include/eigen3/"  -DFFTW_INCLUDES="${{github.workspace}}/builds/fftw/"  -DFFTW_LIB="${{github.workspace}}/builds/fftw/libfftw3-3.lib"  -DLUA_INCLUDE_DIR="${{github.workspace}}/builds/lua/include/" -DLUA_LIBRARIES="${{github.workspace}}/builds/lua/lib/lua.lib" -DFREETYPE_INCLUDE_DIRS="${{github.workspace}}/builds/freetype/include/freetype2/" -DFREETYPE_LIBRARIES="${{github.workspace}}/builds/freetype/lib/freetype.lib" -DPNG_PNG_INCLUDE_DIR="${{github.workspace}}/builds/libpng/include/" -DPNG_LIBRARY_RELEASE="${{github.workspace}}/builds/libpng/lib/libpng16_static.lib" -DZLIB_LIBRARY_RELEASE="${{github.workspace}}/builds/zlib/lib/zlibstatic.lib" -DWXWIDGETS_INCLUDES="${{github.workspace}}/builds/wxWidgets/include/" -DWXWIDGETS_ADV="${{github.workspace}}/builds/wxWidgets/lib/vc_x64_lib/wxmsw32u_adv.lib" -DWXWIDGETS_BASE="${{github.workspace}}/builds/wxWidgets/lib/vc_x64_lib/wxbase32u.lib" -DWXWIDGETS_CORE="${{github.workspace}}/builds/wxWidgets/lib/vc_x64_lib/wxmsw32u_core.lib" -DWXWIDGETS_GL="${{github.workspace}}/builds/wxWidgets/lib/vc_x64_lib/wxmsw32u_gl.lib" -DWXWIDGETS_PNG="${{github.workspace}}/builds/wxWidgets/lib/vc_x64_lib/wxpng.lib" -DWXWIDGETS_JPEG="${{github.workspace}}/builds/wxWidgets/lib/vc_x64_lib/wxjpeg.lib" -DWXWIDGETS_TIFF="${{github.workspace}}/builds/wxWidgets/lib/vc_x64_lib/wxtiff.lib" -DWXWIDGETS_ZLIB="${{github.workspace}}/builds/wxWidgets/lib/vc_x64_lib/wxzlib.lib" -DCPACK_BINARY_NSIS=ON -DCPACK_BINARY_ZIP=ON

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,7 +74,7 @@ add_subdirectory(src/common)
 add_subdirectory(src/common_optics)
 add_subdirectory(src/finite_differences)
 add_subdirectory(src/lua)
-add_subdirectory(src/Materials)
+add_subdirectory(src/materials)
 add_subdirectory(src/multilayers)
 add_subdirectory(src/Selene)
 add_subdirectory(src/structure)