2021 Linux & Windows CMake & C Cleanup

.github/workflows/cmake.yml

@@ -0,0 +1,94 @@
+name: CMake
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set current version as env variable
+      id: versionnumb
+      run: echo "::set-output name=currentversion::v0.2.0"
+
+    - name: Get branch names
+      id: branch-name
+      uses: tj-actions/[email protected]
+
+    - name: Set current os as env variable
+      id: oschoice
+      run: echo "::set-output name=choice::linux"
+
+    - name: Set current date as env variable
+      id: datee
+      run: echo "::set-output name=currentdate::$(date +'%Y-%m-%d_%H%M%S')"
+
+    - name: Set env
+      id: envname
+      run: echo "::set-output name=outname::${{ steps.branch-name.outputs.current_branch }}-${{ steps.oschoice.outputs.choice }}-${{ steps.datee.outputs.currentdate }}"
+
+    - name: Echo current env
+      run: echo ${{ steps.envname.outputs.outname }}
+
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+
+
+    - name: CheckBuildFolder
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ls
+
+    - uses: little-core-labs/[email protected]
+      id: tagName
+      with:
+        tagRegex: "v*"  # Optional. Returns specified group text as tag name. Full tag string is returned if regex is not defined.
+        tagRegexGroup: 1 # Optional. Default is 1.
+
+
+
+    - name: release
+      uses: actions/create-release@v1
+      id: create_release
+      with:
+        draft: false
+        prerelease: true
+        release_name: ${{ steps.envname.outputs.outname }}
+        tag_name: ${{ steps.envname.outputs.outname }}
+        body_path: ${{github.workspace}}/CHANGELOG.md
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+
+
+    - name: upload linux artifact
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./build/normalmap
+        asset_name: normalmap
+        asset_content_type: application/x-executable
+
+

.github/workflows/cmake_windows.yml

@@ -0,0 +1,89 @@
+name: CMake_Windows
+
+on:
+  push:
+    tags:
+      - "v*"
+
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Get branch names
+      id: branch-name
+      uses: tj-actions/[email protected]
+
+    - name: Set current version as env variable
+      id: versionnumb
+      run: echo "::set-output name=currentversion::v0.2.0"
+
+    - name: Set current os as env variable
+      id: oschoice
+      run: echo "::set-output name=choice::windows64"
+
+    - name: Set current date as env variable
+      id: datee
+      run: echo "::set-output name=currentdate::$(date +'%Y-%m-%d_%H%M%S')"
+
+    - name: Set env
+      id: envname
+      run: echo "::set-output name=outname::${{ steps.branch-name.outputs.current_branch }}-${{ steps.oschoice.outputs.choice }}-${{ steps.datee.outputs.currentdate }}"
+
+    - name: Echo current env
+      run: echo ${{ steps.envname.outputs.outname }}
+
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}/win64
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/win64/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+
+    - name: Build
+      working-directory: ${{github.workspace}}/win64
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/win64/build --config ${{env.BUILD_TYPE}}
+
+
+
+
+    - name: release
+      uses: actions/create-release@v1
+      id: create_release
+      with:
+        draft: false
+        prerelease: true
+        release_name: ${{ steps.envname.outputs.outname }}
+        tag_name: ${{ steps.envname.outputs.outname }}
+        body_path: ${{github.workspace}}/CHANGELOG.md
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+
+    - name: Echo current release
+      run: echo "v0.2.0-win64-$(date +'%Y-%m-%d')"
+
+
+
+    - name: Upload Windows Artifact
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./win64/build/Release/normalmap.exe
+        asset_name: normalmap.exe
+        asset_content_type: application/vnd.microsoft.portable-executable
+
+
+

.gitignore

@@ -34,6 +34,8 @@
 
 # CMake
 cmake-build-*/
+build/
+
 
 # IDE
 .idea/

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#531C02",
+        "titleBar.activeBackground": "#742803",
+        "titleBar.activeForeground": "#FFFBFA"
+    },
+    "window.title": "${dirty}${activeEditorShort}${separator}${rootName}${separator}${appName} ${separator} [Branch: master]"
+}

CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+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).
+
+## [Released]
+
+## [0.1.0a] - 2017-01-07
+- Initial original version
+
+## [0.2.0] - 2021-06-07
+### Added
+- win64 source folder for building win64 separately.
+- Github Actions for automatically building Windows and Linux versions every new tag
+- This Changelog
+
+### Fixed
+
+- linux CMake building
+- win64 CMake building
+

CMakeLists.txt

@@ -8,9 +8,12 @@ include_directories(include)
 
 set(SOURCE_FILES
         include/stb_image.h
+        include/mem.h
         src/main.c
         src/stb_image.c
         src/normalmap.c
         include/normalmap.h include/stb_image_write.h src/stb_image_write.c)
 
-add_executable(normalmap ${SOURCE_FILES})
+add_executable(normalmap ${SOURCE_FILES})
+
+target_link_libraries(normalmap PRIVATE m)

README.md

@@ -1,4 +1,5 @@
 # normalmap
+
 Command line utility to convert height maps to DU-DV normal maps.
 
 ## Platforms
@@ -15,6 +16,7 @@ The height will be taken from the red channel of the source image. RGBA PNGs are
 
 The output will be an unfiltered, 8-bit unsigned du/dv map, which can be used as a normal map in rendering applications. The heightmap sampler is a 2x2 box.
 
+## How to Update
 The underlying normal map generation code is inherited from The GIMP and is considerably more flexible. In this version, you must update `main.c` and rebuild to change the following settings:
 
 * Scale *default = 2.0*
@@ -33,3 +35,11 @@ The underlying normal map generation code is inherited from The GIMP and is cons
   * true "normalized" normal
 
 Note that the effect of du/dv output being unnormalized is that normal vectors constructed by sampling the map will require normalization in your shader or image loader, which means in turn that the effect of the scale parameter above is less pronounced than it would be otherwise.
+
+
+
+
+
+
+
+