diff --git a/code/v20/CMakeLists.txt b/code/v20/CMakeLists.txt new file mode 100644 index 0000000..7918205 --- /dev/null +++ b/code/v20/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.7) + +# set the project name +project(pi86 VERSION 1.0) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED True) + +set(CMAKE_BUILD_TYPE Debug) + +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +add_executable(pi86 + # cga.cpp + drives.cpp + pi86.cpp + timer.cpp + vga.cpp + x86.cpp +) + +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +set(THREADS_PREFER_PTHREAD_FLAG TRUE) +find_package(Threads) +target_link_libraries(pi86 Threads::Threads) + +include(FindPkgConfig) + +pkg_check_modules(LIBSDL2 sdl2) +target_link_libraries(pi86 ${LIBSDL2_LIBRARIES}) +target_include_directories(pi86 PUBLIC ${LIBSDL2_INCLUDE_DIRS}) +target_compile_options(pi86 PUBLIC ${LIBSDL2_CFLAGS_OTHER}) + +target_link_libraries(pi86 -lwiringPi) diff --git a/code/v20/cga.cpp b/code/v20/cga.cpp index 0fdea7a..47acaa1 100644 --- a/code/v20/cga.cpp +++ b/code/v20/cga.cpp @@ -81,7 +81,7 @@ void Text_Mode_80x25(SDL_Renderer *Renderer, char* Video_Memory, char* Cursor_Po } -void print_pixs_mode4_palette_0(SDL_Renderer *Renderer, int x, int y, unsigned char Ascii_value) +static void print_pixs_mode4_palette_0(SDL_Renderer *Renderer, int x, int y, unsigned char Ascii_value) { for (int i = 0; i < 4; i++) { @@ -109,7 +109,7 @@ void print_pixs_mode4_palette_0(SDL_Renderer *Renderer, int x, int y, unsigned c } } -void Graphics_Mode_320_200_Palette_0(SDL_Renderer *Renderer, char* Video_Memory) +static void Graphics_Mode_320_200_Palette_0(SDL_Renderer *Renderer, char* Video_Memory) { int index = 0; for (int j = 0; j < 100; j++) diff --git a/code/v20/cga.h b/code/v20/cga.h index e898465..6f38151 100644 --- a/code/v20/cga.h +++ b/code/v20/cga.h @@ -1,7 +1,7 @@ #ifndef CGA_H #define CGA_H -#include "SDL.h" +#include #include "font.h" using namespace std; diff --git a/code/v20/pi86 b/code/v20/pi86 deleted file mode 100644 index dd413b4..0000000 Binary files a/code/v20/pi86 and /dev/null differ diff --git a/code/v20/vga.cpp b/code/v20/vga.cpp index 03de8d3..419f20e 100644 --- a/code/v20/vga.cpp +++ b/code/v20/vga.cpp @@ -72,7 +72,7 @@ void Mode_2_80x25(SDL_Renderer *Renderer, char* Video_Memory, char* Cursor_Posit } -void print_pixs_mode4_palette_0(SDL_Renderer *Renderer, int x, int y, unsigned char Ascii_value) +static void print_pixs_mode4_palette_0(SDL_Renderer *Renderer, int x, int y, unsigned char Ascii_value) { for (int i = 0; i < 4; i++) {