Merge pull request #2 from Ewpratten/ewpratten/rust_project_layout

Pull in Rust project files

.github/workflows/build.yml

@@ -0,0 +1,50 @@
+name: Build Full Release
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest,  windows-latest]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Checkout submodules
+        shell: bash
+        run: |
+          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+          git submodule sync --recursive
+          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+      
+      # When building on Ubuntu, we need some dev libs to compile Raylib correctly
+      - name: Install additional Linux libraries
+        if: runner.os == 'Linux'
+        run: sudo apt-get update && sudo apt-get install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev -y
+        
+      # Build the game
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release --all-features
+
+      # If we are on Linux, do the linux post-process steps
+      - name: Linux packaging
+        if: runner.os == 'Linux'
+        shell: bash
+        run: bash ./automation/scripts/post_process_release_linux.sh
+
+      # If we are on Windows, do the win64 post-process steps
+      - name: Windows packaging
+        if: runner.os == 'Windows'
+        shell: bash
+        run: bash ./automation/scripts/post_process_release_windows.sh
+
+      # Upload any generated artifacts
+      - uses: actions/upload-artifact@v3
+        with:
+          name: game-binaries
+          path: target/production_tmp/ldjam50-*

.gitignore

@@ -0,0 +1,14 @@
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "third_party/raylib-rs"]
+	path = third_party/raylib-rs
+	url = https://github.com/Ewpratten/raylib-rs
+	ignore = dirty

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "git.detectSubmodules": false
+}

Cargo.toml

@@ -0,0 +1,13 @@
+[workspace]
+members = ["./game/game_logic", "./game/desktop_wrapper"]
+exclude = [
+    "./third_party/raylib-rs/raylib",
+    "./third_party/raylib-rs/raylib-sys",
+]
+
+[profile.release]
+lto = true
+codegen-units = 1
+
+[profile.dev]
+split-debuginfo = "unpacked"

README.md

@@ -1,2 +1,15 @@
-# ludum-dare-50
+# Ludum Dare 50: *unnamed game*
-A game build over a weekend for Ludum Dare 50
+[![Build Full Release](https://github.com/Ewpratten/ludum-dare-50/actions/workflows/build.yml/badge.svg)](https://github.com/Ewpratten/ludum-dare-50/actions/workflows/build.yml)
+
+
+
+
+## Cloning
+
+**IMPORTANT:** This project makes use of recursive submodules. Make sure to pull them via GitKracken, or with the following command:
+
+```sh
+git submodule update --init --recursive
+```
+
+*Your builds will fail unless this is done*

automation/scripts/post_process_release_linux.sh

@@ -0,0 +1,11 @@
+#! /bin/bash
+# This script will bundle the game under Linux for publication
+set -ex
+
+export PROD_TMP=./target/production_tmp
+
+rm -rf $PROD_TMP
+mkdir -p $PROD_TMP
+
+mv ./target/release/desktop_wrapper $PROD_TMP/ldjam50-linux-x64
+chmod +x $PROD_TMP/ldjam50-linux-x64

automation/scripts/post_process_release_windows.sh

@@ -0,0 +1,11 @@
+#! /bin/bash
+# This script will bundle the game under Windows for publication
+set -ex
+
+export PROD_TMP=./target/production_tmp
+
+rm -rf $PROD_TMP
+mkdir -p $PROD_TMP
+
+mv ./target/release/desktop_wrapper $PROD_TMP/ldjam50-windows-x64
+chmod +x $PROD_TMP/ldjam50-windows-x64

game/README.md

@@ -1,3 +1,14 @@
 # Here lives the code
 
 This directory should contain game code and exported assets. No workfiles please :)
+
+
+## Directory structure
+
+- `./game_logic`
+  - Contains the actual game code
+- `./desktop_wrapper`
+  - A tiny bit of code to initialize the game and run it
+  - Used to improve the speed of the Rust compiler
+- `./dist`
+  - Anything in here will be bundled directly into the game executable

game/desktop_wrapper/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "desktop_wrapper"
+publish = false
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

game/desktop_wrapper/src/main.rs

@@ -0,0 +1,4 @@
+
+fn main(){
+    
+}

game/dist/README.md

@@ -0,0 +1,3 @@
+# Distributed files
+
+Anything put in here will be bundled with the final game executable.

game/game_logic/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "game_logic"
+publish = false
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+raylib = {version="3.5", path="../../third_party/raylib-rs/raylib"}
+# raylib = { version = "3.5", git = "https://github.com/ewpratten/raylib-rs", branch = "ludum-dare-50" }

rust-toolchain.toml

@@ -0,0 +1,8 @@
+# If you see this, run `rustup self update` to get rustup 1.23 or newer.
+
+# NOTE: above comment is for older `rustup` (before TOML support was added),
+# which will treat the first line as the toolchain name, and therefore show it
+# to the user in the error, instead of "error: invalid channel name '[toolchain]'".
+
+[toolchain]
+channel = "stable"

third_party/raylib-rs

@@ -0,0 +1 @@
+Subproject commit 9320e27aae0abc95a39d74d0221821f8164e5c21