Removed a lot of stuff and cleaned up some of the code

Author: StevenSYS

.github/workflows/build.yml

@@ -10,59 +10,31 @@ jobs:
           - {
             name: "SDL3 - Linux (x64)",
             os: "ubuntu-latest",
-            cFlags: "",
             impl: "SDL3",
             output: "BlockBreakC-SDL3-Linux-x64",
             upload: "BlockBreakC"
           }
           - {
             name: "FreeGLUT (GLUT) - Linux (x64)",
             os: "ubuntu-latest",
-            cFlags: "",
             impl: "GLUT",
             output: "BlockBreakC-FreeGLUT-Linux-x64",
             upload: "BlockBreakC"
           }
-          - {
-            name: "GLFW3 - Linux (x64)",
-            os: "ubuntu-latest",
-            cFlags: "",
-            impl: "GLFW3",
-            output: "BlockBreakC-GLFW3-Linux-x64",
-            upload: "BlockBreakC"
-          }
           - {
             name: "SDL3 + GL - Linux (x64)",
             os: "ubuntu-latest",
-            cFlags: "",
             impl: "SDL3GL",
             output: "BlockBreakC-SDL3GL-Linux-x64",
             upload: "BlockBreakC"
           }
-          - {
-            name: "raylib - Linux (x64)",
-            os: "ubuntu-latest",
-            cFlags: "",
-            impl: "raylib",
-            output: "BlockBreakC-raylib-Linux-x64",
-            upload: "BlockBreakC",
-            raylibVersion: "5.5"
-          }
-          - {
-            name: "Xlib - Linux (x64)",
-            os: "ubuntu-latest",
-            cFlags: "",
-            impl: "Xlib",
-            output: "BlockBreakC-Xlib-Linux-x64",
-            upload: "BlockBreakC"
-          }
     steps:
       - uses: actions/checkout@v4
 
       - name: Update Package Lists
         run: sudo apt-get update
 
-      # SDL3
+      # SDL3 (+ GL)
       - uses: libsdl-org/setup-sdl@main
         if: ${{matrix.build-targets.impl == 'SDL3' || matrix.build-targets.impl == 'SDL3GL'}}
         id: sdl
@@ -75,89 +47,12 @@ jobs:
         if: matrix.build-targets.impl == 'GLUT'
         run: sudo apt-get install freeglut3-dev
 
-      # GLFW3
-      - name: GLFW3 - Install Dependencies
-        if: matrix.build-targets.impl == 'GLFW3'
-        run: sudo apt-get install libwayland-dev libxkbcommon-dev xorg-dev
-      
-      - name: GLFW3 - Clone
-        if: matrix.build-targets.impl == 'GLFW3'
-        run: >
-          git clone
-          --depth 1
-          https://github.com/glfw/glfw.git
-      
-      - name: GLFW3 - Configure CMake
-        if: matrix.build-targets.impl == 'GLFW3'
-        run: >
-          cmake -S glfw
-          -B build/GLFW3
-          -DCMAKE_C_COMPILER=gcc
-          -DCMAKE_BUILD_TYPE=Release
-          -DBUILD_SHARED_LIBS=ON
-          -DGLFW_BUILD_EXAMPLES=OFF
-          -DGLFW_BUILD_TESTS=OFF
-          -DGLFW_BUILD_DOCS=OFF
-          -DCMAKE_C_FLAGS=${{matrix.build-targets.cFlags}}
-          -G "Unix Makefiles"
-      
-      - name: GLFW3 - Build
-        if: matrix.build-targets.impl == 'GLFW3'
-        run: cmake --build build/GLFW3
-      
-      - name: GLFW3 - Install
-        if: matrix.build-targets.impl == 'GLFW3'
-        run: sudo cmake --install build/GLFW3
-      
-      # raylib
-      - name: raylib - Install Dependencies
-        if: matrix.build-targets.impl == 'raylib'
-        run: >
-          sudo apt-get install libasound2-dev libx11-dev libxrandr-dev libxi-dev
-          libgl1-mesa-dev libglu1-mesa-dev libxcursor-dev libxinerama-dev libwayland-dev
-          libxkbcommon-dev
-      
-      - name: raylib - Clone
-        if: matrix.build-targets.impl == 'raylib'
-        run: >
-          git clone
-          --branch ${{matrix.build-targets.raylibVersion}}
-          --depth 1
-          https://github.com/raysan5/raylib.git
-      
-      - name: raylib - Configure CMake
-        if: matrix.build-targets.impl == 'raylib'
-        run: >
-          cmake -S raylib
-          -B build/raylib
-          -DCMAKE_C_COMPILER=gcc
-          -DCMAKE_BUILD_TYPE=Release
-          -DBUILD_SHARED_LIBS=ON
-          -DBUILD_EXAMPLES=OFF
-          -DCMAKE_C_FLAGS=${{matrix.build-targets.cFlags}}
-          -G "Unix Makefiles"
-      
-      - name: raylib - Build
-        if: matrix.build-targets.impl == 'raylib'
-        run: cmake --build build/raylib
-      
-      - name: raylib - Install
-        if: matrix.build-targets.impl == 'raylib'
-        run: sudo cmake --install build/raylib
-      
-      # Xlib
-      - name: Xlib - Install
-        if: matrix.build-targets.impl == 'Xlib'
-        run: sudo apt-get install xorg-dev
-      
       - name: Configure CMake
         run: >
           cmake -S .
           -DCMAKE_C_COMPILER=gcc
           -DCMAKE_BUILD_TYPE=Release
-          -DBUILD_SHARED_LIBS=OFF
           -DIMPL=${{matrix.build-targets.impl}}
-          -DCMAKE_C_FLAGS=${{matrix.build-targets.cFlags}}
           -G "Unix Makefiles"
       
       - name: Build

CMakeLists.txt

@@ -2,61 +2,53 @@ cmake_minimum_required(VERSION 3.12)
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_STANDARD_REQUIRED TRUE)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-project(BlockBreakC LANGUAGES C VERSION 1.2)
+project(BlockBreakC LANGUAGES C VERSION 1.3)
 
-set(IMPL "GLFW3" CACHE STRING "The implementation to build with")
+set(IMPL "SDL3" CACHE STRING "The implementation to build with")
 set(HSSIMPL "libc" CACHE STRING "The high score saving implementation to build with")
-set(SIMPL "Dummy" CACHE STRING "The screenshot implementation to build with")
 option(BUILD_SHARED_LIBS "Build the libraries as shared libraries" OFF)
-option(BUILD_ONLY_IMPL "Build only the implementation library" OFF)
-option(BUILD_AS_LIBRARY "Build the game as a library" OFF)
 option(BUILD_FOR_I586 "Build ${PROJECT_NAME} for i586 (Intel Pentium) or higher" OFF)
-option(ENABLE_SCREENSHOT "Enables taking screenshots" OFF)
-option(USE_BLOCKSIZELIST "Uses the block size list instead of doing the block size calculations at runtime" OFF)
 # Windows Compiler Options
 option(BUILD_USING_MSVCRT20 "Build ${PROJECT_NAME} using msvcrt20 (Windows Compiler Only)" OFF)
-option(BUILD_WITH_RES "Build with the resource file (Windows Compiler Only)" ON)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MD")
-
-include(TestBigEndian)
-TEST_BIG_ENDIAN(BIG_ENDIAN)
-if (BIG_ENDIAN)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBIG_ENDIAN")
-endif()
-
-if(
-	NOT IMPL STREQUAL "DJGPP"
-	AND
-	NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips"
-)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-endif()
-
-if(IMPL STREQUAL "DJGPP")
- 	set(CMAKE_C_COMPILER "i586-pc-msdosdjgpp-gcc")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRENDER_WIDTH=320 -DRENDER_HEIGHT=200 -DFONT_WIDTH=8 -DFONT_HEIGHT=8 -DPLAYER_HEIGHT=7 -DPLAYER_SPEED=4 -DFILENAME83")
-elseif(IMPL STREQUAL "Xlib")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFONT_HEIGHT=10")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFONT_WIDTH=8 -DFONT_HEIGHT=8")
+
+# Impl
+if(IMPL STREQUAL "SDL3")
+	find_package(SDL3 REQUIRED)
+	set(IMPL_FILE "sdl3.c")
+elseif(IMPL STREQUAL "GLUT")
+	find_package(OpenGL REQUIRED)
+	find_package(GLUT REQUIRED)
+	include_directories(
+		${OPENGL_INCLUDE_DIRS}
+		${GLUT_INCLUDE_DIR}
+	)
+	set(IMPL_FILE "glut.c")
+elseif(IMPL STREQUAL "SDL3GL")
+	find_package(SDL3 REQUIRED)
+	find_package(OpenGL REQUIRED)
+	include_directories(${OPENGL_INCLUDE_DIRS})
+	set(IMPL_FILE "sdl3GL.c")
 elseif(IMPL STREQUAL "citro2d")
 	if (NINTENDO_3DS)
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRENDER_WIDTH=400 -DRENDER_HEIGHT=240 -DFONT_WIDTH=8 -DFONT_HEIGHT=8 -DPLAYER_SPEED=5")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRENDER_WIDTH=400 -DRENDER_HEIGHT=240 -DPLAYER_SPEED=5")
 	else()
-		message(FATAL_ERROR "To build the citro2d implementation you must be using the devkitPro 3DS toolchain: -DCMAKE_TOOLCHAIN_FILE=$DEVKITPRO/cmake/3DS.cmake")
+		message(FATAL_ERROR "To build the citro2d implementation you must be using the devkitPro 3DS/2DS toolchain: -DCMAKE_TOOLCHAIN_FILE=$DEVKITPRO/cmake/3DS.cmake")
 	endif()
+	set(IMPL_FILE "citro2d.c")
 else()
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFONT_WIDTH=8 -DFONT_HEIGHT=8")
+	message(FATAL_ERROR "Invalid implementation, the possible values are \"SDL3\", \"GLUT\", \"SDL3GL\" or \"citro2d\"")
 endif()
 
-if(ENABLE_SCREENSHOT)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SCREENSHOT")
-endif()
-
-if(USE_BLOCKSIZELIST)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_BLOCKSIZELIST")
+# HSSImpl
+if(HSSIMPL STREQUAL "libc")
+	set(HSSIMPL_FILE "libc.c")
+elseif(HSSIMPL STREQUAL "Dummy")
+	set(HSSIMPL_FILE "dummy.c")
+else()
+	message(FATAL_ERROR "Invalid high score implementation, the possible values are \"libc\" or \"Dummy\"")
 endif()
 
 set(CMAKE_C_FLAGS_DEBUG "-g -Wall")
@@ -74,68 +66,66 @@ endif()
 
 if(WIN32)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-subsystem,windows")
-	if(BUILD_WITH_RES)
-		set(RESOURCE_FILES "src/res/resource.rc")
-	endif()
+	set(RESOURCE_FILES "src/res/resource.rc")
 	if(BUILD_USING_MSVCRT20)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcrtdll=msvcrt20")
 	endif()
 elseif(NOT WIN32 AND BUILD_USING_MSVCRT20)
 	message(FATAL_ERROR "To build using msvcrt20 you must be using a Windows C compiler")
 endif()
 
-include_directories(
-	"src"
-	"src/impl"
-	"src/impl/highScore"
-	"src/impl/screenshot"
-	"src/shared"
-)
-
-add_subdirectory(src/impl)
-if(ENABLE_SCREENSHOT)
-	add_subdirectory(src/impl/screenshot)
-endif()
-
-file(GLOB SHARED_SOURCE_FILES "src/shared/*.c")
+include_directories("src")
 
-add_library(Shared ${SHARED_SOURCE_FILES})
+file(GLOB SOURCE_FILES "src/*.c")
 
-if(ENABLE_SCREENSHOT)
-	target_link_libraries(Shared SImpl)
-endif()
-
-if(NOT BUILD_ONLY_IMPL)
-	add_subdirectory(src/impl/highScore)
-	
-	file(GLOB SOURCE_FILES "src/*.c")
+add_executable(
+	${PROJECT_NAME}
+	"src/impl/${IMPL_FILE}"
+	"src/hssImpl/${HSSIMPL_FILE}"
+	${RESOURCE_FILES}
+	${SOURCE_FILES}
+)
+if(IMPL STREQUAL "SDL3")
+	target_link_libraries(${PROJECT_NAME} SDL3::SDL3)
+elseif(IMPL STREQUAL "GLUT")
+	target_link_libraries(
+		${PROJECT_NAME}
+		${OPENGL_LIBRARY}
+	)
 
-	if(BUILD_AS_LIBRARY)
-		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBLOCKBREAKC_MAIN_NAME=blockBreakC_main")
-		add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
+	if (BUILD_USING_MSVCRT20)
+		target_link_libraries(${PROJECT_NAME} libglut.a)
 	else()
-		add_executable(${PROJECT_NAME} ${RESOURCE_FILES} ${SOURCE_FILES})
-		if(IMPL STREQUAL "DJGPP")
-			set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".exe")
-		elseif(IMPL STREQUAL "citro2d")
-			ctr_generate_smdh(${PROJECT_NAME}.smdh
-				NAME "${PROJECT_NAME}"
-				DESCRIPTION "A simple game originally made in JavaScript + jQuery"
-				VERSION "v${PROJECT_VERSION}pre"
-				AUTHOR "StevenSYS"
-				ICON "src/res/icon.png"
-			)
-			ctr_create_3dsx(${PROJECT_NAME} SMDH ${PROJECT_NAME}.smdh)
-		endif()
+		target_link_libraries(${PROJECT_NAME} ${GLUT_glut_LIBRARY})
+	endif()
+	
+	if (APPLE)
+		target_link_libraries(${PROJECT_NAME} "-framework OpenGL")
 	endif()
+elseif(IMPL STREQUAL "SDL3GL")
 	target_link_libraries(
 		${PROJECT_NAME}
-		Impl
-		HSSImpl
-		Shared
+		SDL3::SDL3
+		${OPENGL_LIBRARY}
 	)
-	if(ENABLE_SCREENSHOT)
-		target_link_libraries(${PROJECT_NAME} SImpl)
+	
+	if (APPLE)
+		target_link_libraries(${PROJECT_NAME} "-framework OpenGL")
 	endif()
-	set_property(TARGET ${PROJECT_NAME} PROPERTY BUILD_RPATH ".")
-endif()
+elseif(IMPL STREQUAL "citro2d")
+	ctr_generate_smdh(${PROJECT_NAME}.smdh
+		NAME "${PROJECT_NAME}"
+		DESCRIPTION "A simple game originally made in JavaScript + jQuery"
+		VERSION "v${PROJECT_VERSION}pre"
+		AUTHOR "StevenSYS"
+		ICON "src/res/icon.png"
+	)
+	ctr_create_3dsx(${PROJECT_NAME} SMDH ${PROJECT_NAME}.smdh)
+	target_link_libraries(
+		${PROJECT_NAME}
+		citro2d
+		citro3d
+		ctru
+	)
+endif()
+set_property(TARGET ${PROJECT_NAME} PROPERTY BUILD_RPATH ".")