Merge 8424ba5 into 2c915fd

.github/workflows/deploy_web.yml

@@ -9,6 +9,7 @@ jobs:
       - name: Setup emsdk                 
         uses: mymindstorm/setup-emsdk@v10
         with:
+          version: 2.0.21
           actions-cache-folder: 'emsdk-cache'
       - name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
         run: |
@@ -42,3 +43,12 @@ jobs:
           folder: build/bin # The folder the action should deploy.
           force: false
           clean: false
+      - name: Deploy to dev site 🚀
+        if: github.ref == 'refs/heads/dev'
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: gh-pages # The branch the action should deploy to.
+          folder: build/bin # The folder the action should deploy.
+          target-folder: branch/dev
+          force: false
+          clean: false

.gitignore

@@ -38,3 +38,7 @@ build*
 *.swo 
 *.swn
 .vscode
+*.air
+*.dia
+*.metal
+*.metallib

CMakeLists.txt

@@ -143,17 +143,68 @@ else()
 endif()
 target_link_libraries(sokol PUBLIC cimgui)
 target_include_directories(sokol INTERFACE src/sokol)
+
+find_package(Git)
+
+if(GIT_EXECUTABLE)
+  # Generate a git-describe version string from Git repository tags
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE GIT_DESCRIBE
+    RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  if(NOT GIT_DESCRIBE_ERROR_CODE)
+    set(GIT_COMMIT_HASH ${GIT_DESCRIBE})
+  endif()
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE GIT_DESCRIBE
+    RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  if(NOT GIT_DESCRIBE_ERROR_CODE)
+    set(GIT_BRANCH ${GIT_DESCRIBE})
+  endif()
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} describe --exact-match --tags
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE GIT_DESCRIBE
+    RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  if(NOT GIT_DESCRIBE_ERROR_CODE)
+    set(GIT_TAG ${GIT_DESCRIBE})
+  endif()
+endif()
+
+# Final fallback: Just use a bogus version string that is semantically older
+# than anything else and spit out a warning to the developer.
+if(NOT DEFINED GIT_COMMIT_HASH)
+  set(GIT_COMMIT_HASH "(Modified Local Build)")
+  message(WARNING "Failed to determine GIT_COMMIT_HASH from Git tags. Using default version \"${GIT_COMMIT_HASH}\".")
+endif()
+add_definitions(-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\")
+add_definitions(-DGIT_BRANCH=\"${GIT_BRANCH}\")
+add_definitions(-DGIT_TAG=\"${GIT_TAG}\")
+
+set(SKYEMU_SRC src/main.c src/stb.c src/miniz.c)
+
+include_directories(${SDL2_INCLUDE_DIRS})
+
 if(WIN32)
     set(APP_ICON_RESOURCE_WINDOWS "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/icons/appicon.rc")
-    add_executable(${PROJECT_NAME} WIN32 src/main.c ${APP_ICON_RESOURCE_WINDOWS})
+    add_executable(${PROJECT_NAME} WIN32 ${SKYEMU_SRC} ${APP_ICON_RESOURCE_WINDOWS})
 elseif(APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version" FORCE)
     set(MACOSX_BUNDLE_ICON_FILE AppIcon.icns)
     set(APP_ICON src/resources/icons/AppIcon.icns)
     set_source_files_properties(${APP_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-    add_executable(${PROJECT_NAME} src/main.c ${APP_ICON})
+    add_executable(${PROJECT_NAME} ${SKYEMU_SRC} ${APP_ICON})
 else()
-    add_executable(${PROJECT_NAME} src/main.c)
+    add_executable(${PROJECT_NAME} ${SKYEMU_SRC})
 endif()
 if (${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")
     set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-s TOTAL_MEMORY=256MB -lidbfs.js -s ELIMINATE\_DUPLICATE\_FUNCTIONS=1 -flto -s USE_CLOSURE_COMPILER=0 --closure 0 ")

SkyEmu.entitlements

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>