Merge remote-tracking branch 'Wires77/vcproj'

Author: LocalIdentity

.github/workflows/main.yml

@@ -0,0 +1,27 @@
+name: Build DLL
+on: push     
+jobs:
+  build_dll:
+          runs-on: windows-latest
+          steps:
+                  - name: Checkout
+                    uses: actions/checkout@v2
+                    with:
+                      submodules: 'recursive'
+                  - name: run-vcpkg
+                    uses: lukka/run-vcpkg@v3.2
+                    with:
+                        vcpkgDirectory: '${{ github.workspace }}/vcpkg'
+                        vcpkgArguments: '@${{ github.workspace }}/vcpkg.txt'
+                        cleanAfterBuild: false
+                  - name: Setup MSBuild
+                    uses: microsoft/setup-msbuild@v1.0.0
+                  - name: Check dependencies
+                    run: 'ls ${{ github.workspace }}/vcpkg/installed/x86-windows-static'
+                  - name: Build DLL
+                    run: 'msbuild SimpleGraphic.vcxproj /p:configuration=release /p:platform=win32'
+                  - name: Archive DLL
+                    uses: actions/upload-artifact@v1.0.0
+                    with:
+                        name: SimpleGraphic.dll
+                        path: '${{ github.workspace }}/Release/SimpleGraphic.dll'

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/microsoft/vcpkg

DEPENDENCIES.md

@@ -13,15 +13,16 @@ The following 3rd party libraries are required to build SimpleGraphics.dll. Usua
 * tiff 4.0.10-9
 * liblzma 5.2.4-5
 
+These libraries are also listed in vcpkg.txt for our GitHub actions build to reference
+
 ## Using vcpgk to install dependencies on Windows for building with Visual Studio
 
 vcpgk is an open-source tool by Microsoft which can easily download and build all of the required dependencies. This is the recommended method for retrieving the dependencies when building for Visual Studio.
+vcpkg is included as a submodule of this project, so installing it should be relatively simple
 
-1) Clone the vcpgk git repository somewhere on your drive: https://github.com/microsoft/vcpkg.git
-2) Open a console window and change directory to the new vcpkg checkout  
-   * `cd C:\vcpkg`
+1) Run 'git submodule update --init'
+2) 'cd vcpkg'
 3) Type the following commands:
-   1) `bootstrap-vcpkg.bat`
-   2) `vcpkg install giflib:x86-windows-static libjpeg-turbo:x86-windows-static liblzma:x86-windows-static libpng:x86-windows-static luajit:x86-windows-static tiff:x86-windows-static zlib:x86-windows-static`
-4) Copy all folders in the `packages` folder into the `dependencies` folder within the SimpleGraphics checkout.
-5) The SimpleGraphics solution and vcproj are already configured to look in this location for the dependencies, so it should now build as-is.
+   1) `bootstrap-vcpkg.sh` or `bootstrap-vcpkg.bat`
+   2) `./vcpkg.exe install @../vcpkg.txt` or `vcpkg install @../vcpkg.txt`
+4) The SimpleGraphics solution and vcproj are already configured to look in this location for the dependencies, so it should now build as-is.

SimpleGraphic.vcxproj

@@ -112,14 +112,14 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)dependencies\giflib_x86-windows-static\include;$(SolutionDir)dependencies\libjpeg-turbo_x86-windows-static\include;$(SolutionDir)dependencies\liblzma_x86-windows-static\include;$(SolutionDir)dependencies\libpng_x86-windows-static\include;$(SolutionDir)dependencies\luajit_x86-windows-static\include;$(SolutionDir)dependencies\tiff_x86-windows-static\include;$(SolutionDir)dependencies\zlib_x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)vcpkg\installed\x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\giflib_x86-windows-static\lib;$(SolutionDir)dependencies\libjpeg-turbo_x86-windows-static\lib;$(SolutionDir)dependencies\liblzma_x86-windows-static\lib;$(SolutionDir)dependencies\libpng_x86-windows-static\lib;$(SolutionDir)dependencies\luajit_x86-windows-static\lib;$(SolutionDir)dependencies\tiff_x86-windows-static\lib;$(SolutionDir)dependencies\zlib_x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>gif.lib;jpeg.lib;lzma.lib;libpng16.lib;lua51.lib;tiff.lib;zlib.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -134,7 +134,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)dependencies\giflib_x86-windows-static\include;$(SolutionDir)dependencies\libjpeg-turbo_x86-windows-static\include;$(SolutionDir)dependencies\liblzma_x86-windows-static\include;$(SolutionDir)dependencies\libpng_x86-windows-static\include;$(SolutionDir)dependencies\luajit_x86-windows-static\include;$(SolutionDir)dependencies\tiff_x86-windows-static\include;$(SolutionDir)dependencies\zlib_x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)engine;$(SolutionDir)vcpkg\installed\x86-windows-static\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -143,7 +143,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalLibraryDirectories>$(SolutionDir)dependencies\giflib_x86-windows-static\lib;$(SolutionDir)dependencies\libjpeg-turbo_x86-windows-static\lib;$(SolutionDir)dependencies\liblzma_x86-windows-static\lib;$(SolutionDir)dependencies\libpng_x86-windows-static\lib;$(SolutionDir)dependencies\luajit_x86-windows-static\lib;$(SolutionDir)dependencies\tiff_x86-windows-static\lib;$(SolutionDir)dependencies\zlib_x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)vcpkg\installed\x86-windows-static\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>gif.lib;jpeg.lib;lzma.lib;libpng16.lib;lua51.lib;tiff.lib;zlib.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

dependencies/See DEPENDENCIES.md in root for instructions.txt

@@ -0,0 +1,7 @@
+giflib:x86-windows-static
+libjpeg-turbo:x86-windows-static
+liblzma:x86-windows-static
+libpng:x86-windows-static
+luajit:x86-windows-static
+tiff:x86-windows-static
+zlib:x86-windows-static