Merge pull request #4 from Nicky-D/master

Enable Linux builds
secondlife · Jan 2, 2024 · 4f905dd · 4f905dd
2 parents 45d4497 + 815e655
commit 4f905dd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-2022, macos-11] #, ubuntu-22.04]
+        os: [windows-2022, macos-11, ubuntu-22.04]
         addrsize: ["64"]
         include:
           - os: windows-2022

diff --git a/autobuild.xml b/autobuild.xml
@@ -71,7 +71,7 @@
           <key>name</key>
           <string>darwin</string>
         </map>
-        <key>linux</key>
+        <key>linux64</key>
         <map>
           <key>configurations</key>
           <map>
@@ -91,7 +91,7 @@
             <string>lib/release/*.a</string>
           </array>
           <key>name</key>
-          <string>linux</string>
+          <string>linux64</string>
         </map>
         <key>windows</key>
         <map>

diff --git a/build-cmd.sh b/build-cmd.sh
@@ -109,22 +109,32 @@ pushd "$MESHOPT_SOURCE_DIR"
                 export CPPFLAGS="$TARGET_CPPFLAGS"
             fi
 
-            rm -rf build && mkdir build && pushd build
-
-            cmake .. -DCMAKE_INSTALL_PREFIX:STRING="${stage}" \
-
-            make -j $AUTOBUILD_CPU_COUNT
-            make install
+            rm -rf build && mkdir build
+            pushd build
+                cmake .. -DCMAKE_INSTALL_PREFIX:STRING="${stage}"
+
+                make -j $AUTOBUILD_CPU_COUNT
+                make install
+            popd
 
             mkdir -p "$stage/lib/release"
-            mv "$stage/lib/meshoptimizer.a" \
-                "$stage/lib/release/meshoptimizer.a"
+            mv "$stage/lib/libmeshoptimizer.a" \
+                "$stage/lib/release/libmeshoptimizer.a"
 
             mkdir -p "$stage/include/meshoptimizer"
             mv "$stage/include/meshoptimizer.h" \
                 "$stage/include/meshoptimizer/meshoptimizer.h"
 
             rm -r "$stage/lib/cmake"
+
+            # populate version_file - prefer this method of regex extraction
+            # with a multitude of different tools - that can and does break over time.
+            gcc -DVERSION_HEADER_FILE="\"$VERSION_HEADER_FILE\"" \
+               -DVERSION_MACRO="$VERSION_MACRO" \
+               -o "$stage/version" "$top/version.c"
+            "$stage/version" > "$stage/VERSION.txt"
+            rm "$stage/version"
+
         ;;
     esac
     mkdir -p "$stage/LICENSES"