Merge pull request #62 from YoYoGames/fdias-dev-new

Updated extension structure (1.6.4)
YoYoGames · Apr 15, 2024 · 9a3ffc8 · 9a3ffc8
2 parents 8eab067 + 66980f0
commit 9a3ffc8
Show file tree

Hide file tree

Showing 318 changed files with 3,284 additions and 4,081 deletions.
diff --git a/source/.gitattributes → .gitattributes b/source/.gitattributes → .gitattributes
diff --git a/.gitignore b/.gitignore
@@ -1,46 +1,31 @@
-# Prerequisites
-*.d
+# VS and VSC folders
+**/.vs/
+**/.vsc/
 
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
+# Common extensions
+**/*.exp
+**/*.ilk
+**/*.lib
+**/*.pdb
+**/*.exp
+**/*.exe
 
-# Precompiled Headers
-*.gch
-*.pch
+# SteamworksSteamworks SDKs
+source/Steamworks_sdk/
 
-# Compiled Dynamic libraries
-# *.so
-# *.dylib
-# *.dll
+# Steamworks DEMO options
+source/Steamworks_gml/options/
 
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-# Options
-source/Steamworks_gml/options/extensions/*
-**/.vs/**
+# Steamworks build solutions (temp & output)
+**/Debug/
+**/Release/
 
 # MacOS
 .DS_Store
 
-output/
-
-.fake
-*.vsxproj.filters
+# XCode and VS userdata
+*.user
+xcuserdata/
 
-*.xcuserstate
+# Release packages
+output/
diff --git a/metadata.json b/metadata.json
@@ -1 +1 @@
-{"gitHubUrl":"https://github.com/YoYoGames/GMEXT-Steamworks","projectFile":"source/Steamworks_gml/Steamworks.yyp","projectVersion":"LTS22","releaseTemplate":"templates/release_body.md","extensionMetaData":[{"extensionFile":"source/Steamworks_gml/extensions/Steamworks/Steamworks.yy","packageId":"com.yoyogames.steamworksext","packageName":"Steamworks Ext","packageVersion":"1.6.3","packageFormat":"LTS22","includeFolders":null,"includeResources":null,"excludeFolders":null,"excludeResources":null}]}
+{"gitHubUrl":"https://github.com/YoYoGames/GMEXT-Steamworks","projectFile":"source/Steamworks_gml/Steamworks.yyp","projectVersion":"LTS22","releaseTemplate":"templates/release_body.md","extensionMetaData":[{"extensionFile":"source/Steamworks_gml/extensions/Steamworks/Steamworks.yy","packageId":"com.yoyogames.steamworksext","packageName":"Steamworks Ext","packageVersion":"1.6.4","packageFormat":"LTS22","includeFolders":null,"includeResources":null,"excludeFolders":null,"excludeResources":null,"postRemovals":["**/.vs/","**/.vsc/","**/*.exp","**/*.ilk","**/*.lib","**/*.pdb","**/*.exp","**/*.exe","**/Debug/","**/Release/","# MacOS",".DS_Store","*.user","xcuserdata/"]}]}
diff --git a/source/.gitignore b/source/.gitignore
diff --git a/source/Steamworks_gml/Steamworks.resource_order b/source/Steamworks_gml/Steamworks.resource_order
diff --git a/source/Steamworks_gml/Steamworks.yyp b/source/Steamworks_gml/Steamworks.yyp
diff --git a/source/Steamworks_gml/datafiles/GMEXT-Steamwork Unix Docs.html b/source/Steamworks_gml/datafiles/GMEXT-Steamwork Unix Docs.html
diff --git a/source/Steamworks_gml/datafiles/GMEXT-Steamwork Unix Docs.html b/source/Steamworks_gml/datafiles/GMEXT-Steamwork Unix Docs.html
@@ -0,0 +1 @@
+../extensions/steamworks/docs/home.html
diff --git a/source/Steamworks_gml/datafiles/GMEXT-Steamwork Win Docs b/source/Steamworks_gml/datafiles/GMEXT-Steamwork Win Docs
@@ -0,0 +1 @@
+../extensions/Steamworks/docs/home.html
diff --git a/source/Steamworks_gml/datafiles/GMEXT-Steamwork Win Docs.lnk b/source/Steamworks_gml/datafiles/GMEXT-Steamwork Win Docs.lnk
diff --git a/source/Steamworks_gml/extensions/steamworks/.gitignore b/source/Steamworks_gml/extensions/steamworks/.gitignore
diff --git a/source/Steamworks_gml/extensions/steamworks/Steamworks.dll b/source/Steamworks_gml/extensions/steamworks/Steamworks.dll
diff --git a/source/Steamworks_gml/extensions/steamworks/Steamworks.ext b/source/Steamworks_gml/extensions/steamworks/Steamworks.ext
diff --git a/source/Steamworks_gml/extensions/steamworks/Steamworks.yy b/source/Steamworks_gml/extensions/steamworks/Steamworks.yy
diff --git a/source/Steamworks_gml/extensions/steamworks/Steamworks_x64.dll b/source/Steamworks_gml/extensions/steamworks/Steamworks_x64.dll
diff --git a/.../extensions/steamworks/docs/_sidebar.html → .../extensions/steamworks/docs/_Sidebar.html b/.../extensions/steamworks/docs/_sidebar.html → .../extensions/steamworks/docs/_Sidebar.html
diff --git a/source/Steamworks_gml/extensions/steamworks/docs/index.html b/source/Steamworks_gml/extensions/steamworks/docs/index.html
@@ -194,5 +194,5 @@ <h2 id="project-layout">Project layout</h2>
 
 <!--
 MkDocs version : 1.5.3
-Build Date UTC : 2024-03-19 12:18:32.640969+00:00
+Build Date UTC : 2024-04-15 10:29:01.772093+00:00
 -->
diff --git a/source/Steamworks_gml/extensions/steamworks/docs/sitemap.xml.gz b/source/Steamworks_gml/extensions/steamworks/docs/sitemap.xml.gz
diff --git a/source/Steamworks_gml/extensions/steamworks/libSteamworks.dylib b/source/Steamworks_gml/extensions/steamworks/libSteamworks.dylib
diff --git a/source/Steamworks_gml/extensions/steamworks/scriptUtils.bat b/source/Steamworks_gml/extensions/steamworks/scriptUtils.bat
@@ -58,7 +58,7 @@ exit /b 0
 
     set "result=!YYEXTOPT_%EXTENSION_NAME%_%~1!"
     call :logInformation "Accessed extension option '%~1' with value '%result%'."
-    
+
     :: Need to end local (to push into main scope)
     endlocal & set "%~2=%result%"
 exit /b 0

diff --git a/...s_vs/Steamworks/DesktopExtensionTools.cpp → .../steamworks_cpp/DesktopExtensionTools.cpp b/...s_vs/Steamworks/DesktopExtensionTools.cpp → .../steamworks_cpp/DesktopExtensionTools.cpp
diff --git a/...rks_vs/Steamworks/DesktopExtensionTools.h → ...ks/steamworks_cpp/DesktopExtensionTools.h b/...rks_vs/Steamworks/DesktopExtensionTools.h → ...ks/steamworks_cpp/DesktopExtensionTools.h
diff --git a/...ks_vs/Steamworks/DesktopExtensionTools.mm → ...s/steamworks_cpp/DesktopExtensionTools.mm b/...ks_vs/Steamworks/DesktopExtensionTools.mm → ...s/steamworks_cpp/DesktopExtensionTools.mm
diff --git a/...works_vs/Steamworks/Extension_Interface.h → ...orks/steamworks_cpp/Extension_Interface.h b/...works_vs/Steamworks/Extension_Interface.h → ...orks/steamworks_cpp/Extension_Interface.h
diff --git a/...Steamworks/GMLSteam/IniOptionsLibrary.cpp → ...mworks_cpp/GMLSteam/IniOptionsLibrary.cpp b/...Steamworks/GMLSteam/IniOptionsLibrary.cpp → ...mworks_cpp/GMLSteam/IniOptionsLibrary.cpp
diff --git a/...eamworks_vs/Steamworks/GMLSteam/gml_ext.h → ...amworks/steamworks_cpp/GMLSteam/gml_ext.h b/...eamworks_vs/Steamworks/GMLSteam/gml_ext.h → ...amworks/steamworks_cpp/GMLSteam/gml_ext.h
diff --git a/...works_vs/Steamworks/GMLSteam/gml_glue.cpp → ...orks/steamworks_cpp/GMLSteam/gml_glue.cpp b/...works_vs/Steamworks/GMLSteam/gml_glue.cpp → ...orks/steamworks_cpp/GMLSteam/gml_glue.cpp
diff --git a/...amworks_vs/Steamworks/GMLSteam/gml_glue.h → ...mworks/steamworks_cpp/GMLSteam/gml_glue.h b/...amworks_vs/Steamworks/GMLSteam/gml_glue.h → ...mworks/steamworks_cpp/GMLSteam/gml_glue.h
diff --git a/...rks_vs/Steamworks/GMLSteam/gml_glue_map.h → ...ks/steamworks_cpp/GMLSteam/gml_glue_map.h b/...rks_vs/Steamworks/GMLSteam/gml_glue_map.h → ...ks/steamworks_cpp/GMLSteam/gml_glue_map.h
diff --git a/...rks_vs/Steamworks/GMLSteam/steam_apps.cpp → ...ks/steamworks_cpp/GMLSteam/steam_apps.cpp b/...rks_vs/Steamworks/GMLSteam/steam_apps.cpp → ...ks/steamworks_cpp/GMLSteam/steam_apps.cpp
diff --git a/...s/Steamworks/GMLSteam/steam_callbacks.cpp → ...eamworks_cpp/GMLSteam/steam_callbacks.cpp b/...s/Steamworks/GMLSteam/steam_callbacks.cpp → ...eamworks_cpp/GMLSteam/steam_callbacks.cpp
diff --git a/..._vs/Steamworks/GMLSteam/steam_callbacks.h → ...steamworks_cpp/GMLSteam/steam_callbacks.h b/..._vs/Steamworks/GMLSteam/steam_callbacks.h → ...steamworks_cpp/GMLSteam/steam_callbacks.h
diff --git a/...rks_vs/Steamworks/GMLSteam/steam_common.h → ...ks/steamworks_cpp/GMLSteam/steam_common.h b/...rks_vs/Steamworks/GMLSteam/steam_common.h → ...ks/steamworks_cpp/GMLSteam/steam_common.h
diff --git a/.../Steamworks/GMLSteam/steam_controller.cpp → ...amworks_cpp/GMLSteam/steam_controller.cpp b/.../Steamworks/GMLSteam/steam_controller.cpp → ...amworks_cpp/GMLSteam/steam_controller.cpp
diff --git a/..._vs/Steamworks/GMLSteam/steam_friends.cpp → ...steamworks_cpp/GMLSteam/steam_friends.cpp b/..._vs/Steamworks/GMLSteam/steam_friends.cpp → ...steamworks_cpp/GMLSteam/steam_friends.cpp
diff --git a/...ks_vs/Steamworks/GMLSteam/steam_funcs.cpp → ...s/steamworks_cpp/GMLSteam/steam_funcs.cpp b/...ks_vs/Steamworks/GMLSteam/steam_funcs.cpp → ...s/steamworks_cpp/GMLSteam/steam_funcs.cpp
diff --git a/...orks_vs/Steamworks/GMLSteam/steam_funcs.h → ...rks/steamworks_cpp/GMLSteam/steam_funcs.h b/...orks_vs/Steamworks/GMLSteam/steam_funcs.h → ...rks/steamworks_cpp/GMLSteam/steam_funcs.h
diff --git a/...rks_vs/Steamworks/GMLSteam/steam_glue.cpp → ...ks/steamworks_cpp/GMLSteam/steam_glue.cpp b/...rks_vs/Steamworks/GMLSteam/steam_glue.cpp → ...ks/steamworks_cpp/GMLSteam/steam_glue.cpp
diff --git a/...works_vs/Steamworks/GMLSteam/steam_glue.h → ...orks/steamworks_cpp/GMLSteam/steam_glue.h b/...works_vs/Steamworks/GMLSteam/steam_glue.h → ...orks/steamworks_cpp/GMLSteam/steam_glue.h
diff --git a/...rks_vs/Steamworks/GMLSteam/steam_init.cpp → ...ks/steamworks_cpp/GMLSteam/steam_init.cpp b/...rks_vs/Steamworks/GMLSteam/steam_init.cpp → ...ks/steamworks_cpp/GMLSteam/steam_init.cpp
diff --git a/...vs/Steamworks/GMLSteam/steam_init_new.cpp → ...teamworks_cpp/GMLSteam/steam_init_new.cpp b/...vs/Steamworks/GMLSteam/steam_init_new.cpp → ...teamworks_cpp/GMLSteam/steam_init_new.cpp
diff --git a/...ks_vs/Steamworks/GMLSteam/steam_input.cpp → ...s/steamworks_cpp/GMLSteam/steam_input.cpp b/...ks_vs/Steamworks/GMLSteam/steam_input.cpp → ...s/steamworks_cpp/GMLSteam/steam_input.cpp
diff --git a/...s/Steamworks/GMLSteam/steam_inventory.cpp → ...eamworks_cpp/GMLSteam/steam_inventory.cpp b/...s/Steamworks/GMLSteam/steam_inventory.cpp → ...eamworks_cpp/GMLSteam/steam_inventory.cpp
diff --git a/.../Steamworks/GMLSteam/steam_lobby_chat.cpp → ...amworks_cpp/GMLSteam/steam_lobby_chat.cpp b/.../Steamworks/GMLSteam/steam_lobby_chat.cpp → ...amworks_cpp/GMLSteam/steam_lobby_chat.cpp
diff --git a/...Steamworks/GMLSteam/steam_matchmaking.cpp → ...mworks_cpp/GMLSteam/steam_matchmaking.cpp b/...Steamworks/GMLSteam/steam_matchmaking.cpp → ...mworks_cpp/GMLSteam/steam_matchmaking.cpp
diff --git a/...rks_vs/Steamworks/GMLSteam/steam_misc.cpp → ...ks/steamworks_cpp/GMLSteam/steam_misc.cpp b/...rks_vs/Steamworks/GMLSteam/steam_misc.cpp → ...ks/steamworks_cpp/GMLSteam/steam_misc.cpp
diff --git a/...ks_vs/Steamworks/GMLSteam/steam_music.cpp → ...s/steamworks_cpp/GMLSteam/steam_music.cpp b/...ks_vs/Steamworks/GMLSteam/steam_music.cpp → ...s/steamworks_cpp/GMLSteam/steam_music.cpp
diff --git a/.../Steamworks/GMLSteam/steam_networking.cpp → ...amworks_cpp/GMLSteam/steam_networking.cpp b/.../Steamworks/GMLSteam/steam_networking.cpp → ...amworks_cpp/GMLSteam/steam_networking.cpp
diff --git a/...eamworks/GMLSteam/steam_remotestorage.cpp → ...orks_cpp/GMLSteam/steam_remotestorage.cpp b/...eamworks/GMLSteam/steam_remotestorage.cpp → ...orks_cpp/GMLSteam/steam_remotestorage.cpp
diff --git a/...Steamworks/GMLSteam/steam_screenshots.cpp → ...mworks_cpp/GMLSteam/steam_screenshots.cpp b/...Steamworks/GMLSteam/steam_screenshots.cpp → ...mworks_cpp/GMLSteam/steam_screenshots.cpp
diff --git a/...orks_vs/Steamworks/GMLSteam/steam_ugc.cpp → ...rks/steamworks_cpp/GMLSteam/steam_ugc.cpp b/...orks_vs/Steamworks/GMLSteam/steam_ugc.cpp → ...rks/steamworks_cpp/GMLSteam/steam_ugc.cpp
diff --git a/...vs/Steamworks/GMLSteam/steam_unsorted.cpp → ...teamworks_cpp/GMLSteam/steam_unsorted.cpp b/...vs/Steamworks/GMLSteam/steam_unsorted.cpp → ...teamworks_cpp/GMLSteam/steam_unsorted.cpp
diff --git a/...rks_vs/Steamworks/GMLSteam/steam_user.cpp → ...ks/steamworks_cpp/GMLSteam/steam_user.cpp b/...rks_vs/Steamworks/GMLSteam/steam_user.cpp → ...ks/steamworks_cpp/GMLSteam/steam_user.cpp
diff --git a/...s/Steamworks/GMLSteam/steam_userstats.cpp → ...eamworks_cpp/GMLSteam/steam_userstats.cpp b/...s/Steamworks/GMLSteam/steam_userstats.cpp → ...eamworks_cpp/GMLSteam/steam_userstats.cpp
diff --git a/...ks_vs/Steamworks/GMLSteam/steam_utils.cpp → ...s/steamworks_cpp/GMLSteam/steam_utils.cpp b/...ks_vs/Steamworks/GMLSteam/steam_utils.cpp → ...s/steamworks_cpp/GMLSteam/steam_utils.cpp
diff --git a/...vs/Steamworks/GMLSteam/steam_workshop.cpp → ...teamworks_cpp/GMLSteam/steam_workshop.cpp b/...vs/Steamworks/GMLSteam/steam_workshop.cpp → ...teamworks_cpp/GMLSteam/steam_workshop.cpp
diff --git a/source/Steamworks_vs/Steamworks/Ref.h → ...xtensions/steamworks/steamworks_cpp/Ref.h b/source/Steamworks_vs/Steamworks/Ref.h → ...xtensions/steamworks/steamworks_cpp/Ref.h
diff --git a/source/Steamworks_vs/Steamworks/YYRValue.h → ...ions/steamworks/steamworks_cpp/YYRValue.h b/source/Steamworks_vs/Steamworks/YYRValue.h → ...ions/steamworks/steamworks_cpp/YYRValue.h
diff --git a/source/Steamworks_vs/Steamworks/dllmain.cpp → ...ons/steamworks/steamworks_cpp/dllmain.cpp b/source/Steamworks_vs/Steamworks/dllmain.cpp → ...ons/steamworks/steamworks_cpp/dllmain.cpp
diff --git a/source/Steamworks_vs/Steamworks/framework.h → ...ons/steamworks/steamworks_cpp/framework.h b/source/Steamworks_vs/Steamworks/framework.h → ...ons/steamworks/steamworks_cpp/framework.h
diff --git a/source/Steamworks_vs/Steamworks/pch.cpp → ...ensions/steamworks/steamworks_cpp/pch.cpp b/source/Steamworks_vs/Steamworks/pch.cpp → ...ensions/steamworks/steamworks_cpp/pch.cpp
diff --git a/source/Steamworks_vs/Steamworks/pch.h → ...xtensions/steamworks/steamworks_cpp/pch.h b/source/Steamworks_vs/Steamworks/pch.h → ...xtensions/steamworks/steamworks_cpp/pch.h
diff --git a/source/build_linux64.sh → ...amworks/steamworks_linux/build_linux64.sh b/source/build_linux64.sh → ...amworks/steamworks_linux/build_linux64.sh
@@ -12,15 +12,15 @@ echo Steam RT? "$YYSTEAMRT"
 if "$YYCOMPILER" -m64 \
     -Wno-invalid-offsetof \
     -std=c++17 \
-	Steamworks_vs/Steamworks/*.cpp \
-    Steamworks_vs/Steamworks/GMLSteam/steam_*.cpp \
+	../Steamworks_cpp/*.cpp \
+    ../Steamworks_cpp/GMLSteam/steam_*.cpp \
     -Wl,-rpath,assets/ -fPIC \
-    -LSteamworks_sdk/redistributable_bin/linux64 \
+    -L../../../../Steamworks_sdk/redistributable_bin/linux64 \
     -lsteam_api \
-    -ISteamworks_sdk/public/steam \
-	-ISteamworks_vs/Steamworks/GMLSteam/ \
-	-ISteamworks_vs/Steamworks/ \
-    -shared -o Steamworks_gml/extensions/steamworks/Steamworks.so;
+    -I../../../../Steamworks_sdk/public/steam \
+	-I../../../../Steamworks_vs/Steamworks/GMLSteam/ \
+	-I../Steamworks_cpp/ \
+    -shared -o ../Steamworks.so;
 then
     echo "BUILD SUCCESS";
 else

diff --git a/source/slr_build_linux64.sh → ...rks/steamworks_linux/slr_build_linux64.sh b/source/slr_build_linux64.sh → ...rks/steamworks_linux/slr_build_linux64.sh
diff --git a/...code/Steamworks.xcodeproj/project.pbxproj → ...acos/Steamworks.xcodeproj/project.pbxproj b/...code/Steamworks.xcodeproj/project.pbxproj → ...acos/Steamworks.xcodeproj/project.pbxproj
@@ -100,7 +100,7 @@
 		2BADDA3427C27D9E00682B15 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
-			dstPath = "${PROJECT_DIR}/../Steamworks_gml/extensions/Steamworks";
+			dstPath = "${PROJECT_DIR}/..";
 			dstSubfolderSpec = 0;
 			files = (
 				6ABC1B48280CBC3200BE82A7 /* libSteamworks.dylib in CopyFiles */,
@@ -111,17 +111,17 @@
 
 /* Begin PBXFileReference section */
 		2B53B66B27972B9300544C01 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		2BC97896287F3DAD0079F3E2 /* DesktopExtensionTools.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DesktopExtensionTools.mm; path = ../Steamworks_vs/Steamworks/DesktopExtensionTools.mm; sourceTree = SOURCE_ROOT; };
-		2BC9789A287F3DE60079F3E2 /* DesktopExtensionTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DesktopExtensionTools.h; path = ../Steamworks_vs/Steamworks/DesktopExtensionTools.h; sourceTree = SOURCE_ROOT; };
+		2BC97896287F3DAD0079F3E2 /* DesktopExtensionTools.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DesktopExtensionTools.mm; path = ../steamworks_cpp/DesktopExtensionTools.mm; sourceTree = SOURCE_ROOT; };
+		2BC9789A287F3DE60079F3E2 /* DesktopExtensionTools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DesktopExtensionTools.h; path = ../steamworks_cpp/DesktopExtensionTools.h; sourceTree = SOURCE_ROOT; };
 		2BDE0923278F96F80090737D /* libSteamworks.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSteamworks.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		2BDE0997278F97E60090737D /* Extension_Interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Extension_Interface.h; path = ../Steamworks_vs/Steamworks/Extension_Interface.h; sourceTree = SOURCE_ROOT; };
-		2BDE0998278F97E60090737D /* dllmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dllmain.cpp; path = ../Steamworks_vs/Steamworks/dllmain.cpp; sourceTree = SOURCE_ROOT; };
-		2BDE0999278F97E60090737D /* pch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pch.cpp; path = ../Steamworks_vs/Steamworks/pch.cpp; sourceTree = SOURCE_ROOT; };
-		2BDE099A278F97E60090737D /* YYRValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YYRValue.h; path = ../Steamworks_vs/Steamworks/YYRValue.h; sourceTree = SOURCE_ROOT; };
-		2BDE099B278F97E60090737D /* Ref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Ref.h; path = ../Steamworks_vs/Steamworks/Ref.h; sourceTree = SOURCE_ROOT; };
-		2BDE099C278F97E60090737D /* framework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = framework.h; path = ../Steamworks_vs/Steamworks/framework.h; sourceTree = SOURCE_ROOT; };
-		2BDE099D278F97E60090737D /* pch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pch.h; path = ../Steamworks_vs/Steamworks/pch.h; sourceTree = SOURCE_ROOT; };
-		2BDE09B62790A50B0090737D /* libsteam_api.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsteam_api.dylib; path = ../steamworks_sdk/redistributable_bin/osx/libsteam_api.dylib; sourceTree = "<group>"; };
+		2BDE0997278F97E60090737D /* Extension_Interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Extension_Interface.h; path = ../steamworks_cpp/Extension_Interface.h; sourceTree = SOURCE_ROOT; };
+		2BDE0998278F97E60090737D /* dllmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dllmain.cpp; path = ../steamworks_cpp/dllmain.cpp; sourceTree = SOURCE_ROOT; };
+		2BDE0999278F97E60090737D /* pch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pch.cpp; path = ../steamworks_cpp/pch.cpp; sourceTree = SOURCE_ROOT; };
+		2BDE099A278F97E60090737D /* YYRValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YYRValue.h; path = ../steamworks_cpp/YYRValue.h; sourceTree = SOURCE_ROOT; };
+		2BDE099B278F97E60090737D /* Ref.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Ref.h; path = ../steamworks_cpp/Ref.h; sourceTree = SOURCE_ROOT; };
+		2BDE099C278F97E60090737D /* framework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = framework.h; path = ../steamworks_cpp/framework.h; sourceTree = SOURCE_ROOT; };
+		2BDE099D278F97E60090737D /* pch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pch.h; path = ../steamworks_cpp/pch.h; sourceTree = SOURCE_ROOT; };
+		2BDE09B62790A50B0090737D /* libsteam_api.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsteam_api.dylib; path = ../../../../Steamworks_sdk/redistributable_bin/osx/libsteam_api.dylib; sourceTree = SOURCE_ROOT; };
 		6A2A820F2934DA8C002B2CE5 /* isteamps3overlayrenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isteamps3overlayrenderer.h; sourceTree = "<group>"; };
 		6A2A82102934DA8C002B2CE5 /* steamhttpenums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = steamhttpenums.h; sourceTree = "<group>"; };
 		6A2A82112934DA8C002B2CE5 /* steam_api_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = steam_api_internal.h; sourceTree = "<group>"; };
@@ -247,7 +247,7 @@
 				2BDE0931278F974F0090737D /* Include */,
 			);
 			name = Steamworks;
-			path = ../Steamworks_vs/Steamworks;
+			path = ../steamworks_cpp;
 			sourceTree = SOURCE_ROOT;
 		};
 		2BDE0931278F974F0090737D /* Include */ = {
@@ -302,7 +302,7 @@
 				6A2A82332934DA8D002B2CE5 /* steamuniverse.h */,
 			);
 			name = Include;
-			path = ../Steamworks_sdk/public/steam;
+			path = ../../../../Steamworks_sdk/public/steam;
 			sourceTree = SOURCE_ROOT;
 		};
 		2BDE0932278F975F0090737D /* GMSteam */ = {
@@ -341,7 +341,7 @@
 				6A2A82722934DAD3002B2CE5 /* steam_workshop.cpp */,
 			);
 			name = GMSteam;
-			path = ../Steamworks_vs/Steamworks/GMLSteam;
+			path = ../steamworks_cpp/GMLSteam;
 			sourceTree = SOURCE_ROOT;
 		};
 		2BDE09A5278F9A940090737D /* Frameworks */ = {
@@ -644,8 +644,8 @@
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				LIBRARY_SEARCH_PATHS = (
-					../steamworks_sdk/redistributable_bin/,
-					../steamworks_sdk/redistributable_bin/osx/,
+					../../../../steamworks_sdk/redistributable_bin/,
+					../../../../steamworks_sdk/redistributable_bin/osx/,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -668,8 +668,8 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "OS_MacOs=1";
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				LIBRARY_SEARCH_PATHS = (
-					../steamworks_sdk/redistributable_bin/,
-					../steamworks_sdk/redistributable_bin/osx/,
+					../../../../steamworks_sdk/redistributable_bin/,
+					../../../../steamworks_sdk/redistributable_bin/osx/,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...cshareddata/xcschemes/Steamworks.xcscheme → ...cshareddata/xcschemes/Steamworks.xcscheme b/...cshareddata/xcschemes/Steamworks.xcscheme → ...cshareddata/xcschemes/Steamworks.xcscheme
diff --git a/source/Steamworks_vs/Steamworks.sln → ...amworks/steamworks_windows/Steamworks.sln b/source/Steamworks_vs/Steamworks.sln → ...amworks/steamworks_windows/Steamworks.sln
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"gitHubUrl":"https://github.com/YoYoGames/GMEXT-Steamworks","projectFile":"source/Steamworks_gml/Steamworks.yyp","projectVersion":"LTS22","releaseTemplate":"templates/release_body.md","extensionMetaData":[{"extensionFile":"source/Steamworks_gml/extensions/Steamworks/Steamworks.yy","packageId":"com.yoyogames.steamworksext","packageName":"Steamworks Ext","packageVersion":"1.6.3","packageFormat":"LTS22","includeFolders":null,"includeResources":null,"excludeFolders":null,"excludeResources":null}]}
		{"gitHubUrl":"https://github.com/YoYoGames/GMEXT-Steamworks","projectFile":"source/Steamworks_gml/Steamworks.yyp","projectVersion":"LTS22","releaseTemplate":"templates/release_body.md","extensionMetaData":[{"extensionFile":"source/Steamworks_gml/extensions/Steamworks/Steamworks.yy","packageId":"com.yoyogames.steamworksext","packageName":"Steamworks Ext","packageVersion":"1.6.4","packageFormat":"LTS22","includeFolders":null,"includeResources":null,"excludeFolders":null,"excludeResources":null,"postRemovals":["/.vs/","/.vsc/","*/.exp","*/.ilk","*/.lib","*/.pdb","*/.exp","*/.exe","/Debug/","/Release/","# MacOS",".DS_Store","*.user","xcuserdata/"]}]}