Merge pull request #39 from nayaku/master

Fix compile fails with mingw32-w64-i686 compiler

Author: RobLoach

.github/workflows/Tests.yml

@@ -6,28 +6,51 @@ jobs:
   build-ubuntu:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-    - name: Install Dependencies
-      run: sudo apt-get install xorg-dev libglu1-mesa-dev
-    - name: Configure
-      run: cmake -B build .
-    - name: Build
-      run: cmake --build build
-    - name: Test
-      working-directory: build
-      run: ctest --output-on-failure
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install Dependencies
+        run: sudo apt-get install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
+      - name: Configure
+        run: cmake -B build .
+      - name: Build
+        run: cmake --build build --config Release
+      - name: Test
+        working-directory: build
+        run: ctest --output-on-failure
 
   build-windows:
     runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      max-parallel: 1
+      matrix:
+        compiler: [mingw-w64,msvc16]
+        include:
+          - compiler: mingw-w64
+            PLATFORM_NAME: "MinGW Makefiles"
+          - compiler: msvc16
+            PLATFORM_NAME: "Visual Studio 16 2019"
     steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-    - name: Configure
-      run: cmake -B build .
-    - name: Build
-      run: cmake --build build
-    - name: Test
-      run: build\bin\Debug\raylib-lua-sol.exe tests/raylib-lua-sol-tests.lua
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      # Setup Visual Studio
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.0.2
+        if: matrix.compiler == 'msvc16'
+
+      - name: Configure
+        run: cmake -G "${{ matrix.platform_name }}" -B build_${{ matrix.compiler }} .
+
+      - name: Build
+        run: cmake --build build_${{ matrix.compiler }} --config Release
+
+      - name: Test (mingw-w64)
+        run: build_${{ matrix.compiler }}\bin\raylib-lua-sol.exe tests/raylib-lua-sol-tests.lua
+        if: matrix.compiler == 'mingw-w64'
+
+      - name: Test (msvc16)
+        run: build_${{ matrix.compiler }}\bin\Release\raylib-lua-sol.exe tests/raylib-lua-sol-tests.lua
+        if: matrix.compiler == 'msvc16'

CMakeLists.txt

@@ -8,7 +8,7 @@ project (raylib-lua-sol
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 configure_file(${CMAKE_SOURCE_DIR}/cmake/CTestCustom.cmake ${CMAKE_BINARY_DIR})
 
-if (WIN32)
+if (MSVC)
   #add_compile_options("/SUBSYSTEM:WINDOWS")
   #add_compile_options("/ENTRY:mainCRTStartup")
   #ADD_DEFINITIONS(/bigobj)
@@ -17,6 +17,13 @@ if (WIN32)
   SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /bigobj")
   SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /bigobj")
   SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /bigobj")
+elseif(MINGW OR CYGWIN)
+  add_definitions(-O3)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
+  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wa,-mbig-obj")
+  SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Wa,-mbig-obj")
+  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wa,-mbig-obj")
+  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Os -Wa,-mbig-obj")
 endif()
 
 # Options

README.md

@@ -40,6 +40,31 @@ Note that launcher can also be compiled for other platforms, just need to link w
 bin/raylib-lua-sol examples/core_basic_window.lua
 ```
 
+## Prebuild On Windows
+
+Require:
+
+- C Compiler: MinGW([Cygwin](https://cygwin.com/install.html),...) or [Visual Studio](https://visualstudio.microsoft.com/downloads/).
+- [CMake](https://cmake.org/download/).
+
+## Prebuild On GNU Linux
+
+```bash
+sudo apt install build-essential git cmake
+```
+
+### Unbuntu
+
+```bash
+sudo apt install libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
+```
+
+### Fedora
+
+```bash
+sudo dnf install alsa-lib-devel mesa-libGL-devel libX11-devel libXrandr-devel libXi-devel libXcursor-devel libXinerama-devel
+```
+
 ## Build
 
 *raylib-lua-sol* uses cmake as a primary development target. Would appreciate adding more project templates, however.
@@ -49,7 +74,7 @@ git clone https://github.com/RobLoach/raylib-lua-sol.git
 cd raylib-lua-sol
 git submodule update --init
 cmake -B build .
-cmake --build build
+cmake --build build --config Release
 ```
 
 ## Development