Merge pull request #57 from tsoding/remove-sdl2

Remove SDL version of Sowon entirely

Author: rexim

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -qq libsdl2-dev
+          sudo apt-get install -qq libgl-dev libxcursor-dev libxrandr-dev libxi-dev
       - name: build sowon
         run: |
           make
@@ -22,7 +22,7 @@ jobs:
       - name: install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -qq libsdl2-dev
+          sudo apt-get install -qq libgl-dev libxcursor-dev libxrandr-dev libxi-dev
       - name: build sowon
         run: |
           make
@@ -32,8 +32,6 @@ jobs:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v1
-      - name: install dependencies
-        run: brew install sdl2 pkg-config
       - name: build sowon
         run: |
           make
@@ -43,11 +41,6 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - name: download sdl2
-        run: |
-          curl -fsSL -o SDL2-devel-2.0.12-VC.zip https://www.libsdl.org/release/SDL2-devel-2.0.12-VC.zip
-          tar -xf SDL2-devel-2.0.12-VC.zip
-          mv SDL2-2.0.12 SDL2
       - name: build sowon
         shell: cmd
         run: |

.gitignore

@@ -3,7 +3,6 @@ sowon_rgfw
 build/
 *.kra
 *~
-SDL2
 *.obj
 *.exe
 .dSYM/

Makefile

@@ -1,10 +1,8 @@
 UNAMEOS = $(shell uname)
 
 COMMON_CFLAGS=		-Wall -Wextra -ggdb -std=c99 -pedantic -Ithirdparty -Ibuild -DPENGER
-SDL2_CFLAGS=		`pkg-config --cflags sdl2` $(COMMON_CFLAGS)
 RGFW_CFLAGS=		$(COMMON_CFLAGS)
 COMMON_LIBS=		-lm
-SDL2_LIBS=			`pkg-config --libs sdl2` $(COMMON_LIBS)
 ifeq ($(UNAMEOS),Darwin)
 RGFW_LIBS=			$(COMMON_LIBS) -framework CoreVideo -framework Cocoa -framework OpenGL -framework IOKit
 else
@@ -14,13 +12,10 @@ PREFIX?=		/usr/local
 INSTALL?=		install
 
 .PHONY: all
-all: Makefile sowon sowon_rgfw man
-
-sowon_rgfw: src/main_rgfw.c build/digits.h build/penger_walk_sheet.h
-	$(CC) $(RGFW_CFLAGS) -o sowon_rgfw src/main_rgfw.c $(RGFW_LIBS)
+all: Makefile sowon man
 
 sowon: src/main.c build/digits.h build/penger_walk_sheet.h
-	$(CC) $(SDL2_CFLAGS) -o sowon src/main.c $(SDL2_LIBS)
+	$(CC) $(RGFW_CFLAGS) -o sowon src/main.c $(RGFW_LIBS)
 
 build/digits.h: build/png2c ./assets/digits.png
 	./build/png2c ./assets/digits.png digits > build/digits.h
@@ -42,12 +37,11 @@ man: docs/sowon.6.gz
 
 .PHONY: clean
 clean:
-	rm -r sowon sowon_rgfw build docs/sowon.6.gz
+	rm -r sowon build docs/sowon.6.gz
 
 .PHONY: install
 install: all
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) -C ./sowon $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL) -C ./sowon_rgfw $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/man/man6
 	$(INSTALL) -C docs/sowon.6.gz $(DESTDIR)$(PREFIX)/man/man6

README.md

@@ -6,19 +6,17 @@
 
 ## Build
 
-Dependencies: [SDL2](https://www.libsdl.org/download-2.0.php)
+### Ubuntu
 
-### Debian
 ```console
-$ sudo apt-get install libsdl2-dev
+$ sudo apt-get install -qq libgl-dev libxcursor-dev libxrandr-dev libxi-dev
 $ make
 $ ./sowon
 ```
 
 ### MacOS
 
 ```console
-$ brew install sdl2 pkg-config
 $ make
 $ ./sowon
 ```
@@ -27,15 +25,10 @@ $ ./sowon
 
 #### Visual Studio
 
-- Enter the Visual Studio Command Line Development Environment https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line
-  - Basically just find `vcvarsall.bat` and run `vcvarsall.bat x64` inside of cmd
-- Download [SDL2 VC Development Libraries](https://libsdl.org/release/SDL2-devel-2.0.12-VC.zip) and copy it to `path\to\sowon`
+- Enter the Visual Studio Command Line Development Environment <https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line>. Basically just find `vcvarsall.bat` and run `vcvarsall.bat x64` inside of cmd
 
 ```console
 > cd path\to\sowon
-> tar -xf SDL2-devel-2.0.12-VC.zip
-> move SDL2-2.0.12 SDL2
-> del SDL2-devel-2.0.12-VC.zip
 > build_msvc
 ```
 

build_msvc.bat

@@ -2,15 +2,12 @@
 rem launch this from msvc-enabled console
 
 set COMMON_CXXFLAGS=/std:c++17 /O2 /FC /W4 /nologo /I thirdparty /I build
-set SDL2_CXXFLAGS=%COMMON_CXXFLAGS% /I SDL2\include
 set RGFW_CXXFLAGS=%COMMON_CXXFLAGS%
 set COMMON_LIBS=Shell32.lib
-set SDL2_LIBS=%COMMON_LIBS% SDL2\lib\x64\SDL2.lib SDL2\lib\x64\SDL2main.lib -SUBSYSTEM:windows
 set RGFW_LIBS=%COMMON_LIBS% -SUBSYSTEM:windows /entry:mainCRTStartup
 
 mkdir build
 cl.exe %COMMON_CXXFLAGS% /Febuild\png2c src\png2c.c /link %COMMON_LIBS% -SUBSYSTEM:console
 build\png2c.exe assets\digits.png digits > build\digits.h
 build\png2c.exe assets\penger_walk_sheet.png penger > build\penger_walk_sheet.h
-cl.exe %SDL2_CXXFLAGS% /Fesowon src/main.c /link %SDL2_LIBS%
-cl.exe %RGFW_CXXFLAGS% /Fesowon_rgfw src/main_rgfw.c /link %RGFW_LIBS%
+cl.exe %RGFW_CXXFLAGS% /Fesowon src/main.c /link %RGFW_LIBS%