Merge pull request #185 from OldFoolAgain/prep-work

Organization for ease of maintenance when updating ide/make files from different OS's
UOX3DevTeam · Aug 27, 2023 · ef71b6f · ef71b6f
2 parents cf13a1c + 4ef4c39
commit ef71b6f
Show file tree

Hide file tree

Showing 26 changed files with 627 additions and 511 deletions.
diff --git a/.github/workflows/build.yml → .github/workflows/UOX3Build.yml b/.github/workflows/build.yml → .github/workflows/UOX3Build.yml
@@ -8,7 +8,6 @@ on:
       - '**.dfn'
       - '**.scp'
       - '**.txt'
-      - '**.html'
       - '**.md'
       - '**.html'
       - '**.sln'
@@ -21,7 +20,6 @@ on:
       - '**.dfn'
       - '**.scp'
       - '**.txt'
-      - '**.html'
       - '**.md'
       - '**.html'
       - '**.sln'
@@ -36,19 +34,20 @@ jobs:
   build:
     strategy:
       matrix:
-         os: [ubuntu-latest, windows-latest, macos-13]
+        os: [ubuntu-latest, windows-latest, macos-13]
+    # 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: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v3
-      with: 
-         submodules: true
     - 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 make/cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} 
 
     - name: Build
-      # Build
+      # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
 
diff --git a/make/VS2017/uox3.vcxproj b/make/VS2017/uox3.vcxproj
@@ -474,7 +474,7 @@
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</BrowseInformation>
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</BrowseInformation>
     </ClCompile>
-    <ClCompile Include="..\..\source\cBaseobject.cpp">
+    <ClCompile Include="..\..\source\cBaseObject.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DebugProfile|Win32'">Disabled</Optimization>
       <Optimization Condition="'$(Configuration)|$(Platform)'=='DebugProfile|x64'">Disabled</Optimization>
       <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='DebugProfile|Win32'">true</BrowseInformation>
@@ -1419,7 +1419,7 @@
     <ClInclude Include="..\..\source\EventTimer.hpp" />
     <ClInclude Include="..\..\source\funcdecl.h" />
     <ClInclude Include="..\..\source\GenericList.h" />
-    <ClInclude Include="..\..\source\gump.h" />
+    <ClInclude Include="..\..\source\CGump.h" />
     <ClInclude Include="..\..\source\IP4Address.hpp" />
     <ClInclude Include="..\..\source\jail.h" />
     <ClInclude Include="..\..\source\JSEncapsulate.h" />
@@ -1436,7 +1436,6 @@
     <ClInclude Include="..\..\source\power.h" />
     <ClInclude Include="..\..\source\Prerequisites.h" />
     <ClInclude Include="..\..\source\regions.h" />
-    <ClInclude Include="..\..\source\resource.h" />
     <ClInclude Include="..\..\source\scriptc.h" />
     <ClInclude Include="..\..\source\SEFunctions.h" />
     <ClInclude Include="..\..\source\skills.h" />