resolve build issues

Author: ololoshka2871 - wsl

libs/CMakeLists.txt

@@ -1,16 +1,13 @@
 
+### options to build SDL ###
+option(SDL2_DISABLE_INSTALL "" ON)
+option(SDL2_DISABLE_SDL2MAIN "" ON)
 option(BUILD_SHARED_LIBS "" OFF)
-add_subdirectory(SDL_ttf)
+add_subdirectory(SDL)
 
 ###############################################################################
 
-if (UNIX)
-	find_package(SDL2 REQUIRED)
-else()
-	# from command line -DSDL2_LIBRARY=.. -DSDL2_INCLUDE_DIR=..
-	set(SDL2_LIBRARIES ${SDL2_LIBRARY})
-	set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
-endif()
+add_subdirectory(SDL_ttf)
 
 ###############################################################################
 
@@ -25,6 +22,11 @@ add_library(imgui STATIC
 	imgui/imstb_rectpack.h
 	imgui/imstb_textedit.h
 	imgui/imstb_truetype.h
+
+	imgui/backends/imgui_impl_sdl.cpp
+	imgui/backends/imgui_impl_sdl.h
+	imgui/backends/imgui_impl_sdlrenderer.cpp
+	imgui/backends/imgui_impl_sdlrenderer.h
 )
 
 target_include_directories(imgui
@@ -33,20 +35,26 @@ target_include_directories(imgui
 		imgui/backends
 )
 
+target_link_libraries(imgui
+	PUBLIC
+		SDL2::SDL2-static
+)
+
 add_library(imgui_sdl STATIC
     imgui_sdl/imgui_sdl.cpp
     imgui_sdl/imgui_sdl.h
 )
 
+message(STATUS ${SDL2_INCLUDE_DIRS})
+
 target_link_libraries(imgui_sdl
     PUBLIC
-        ${SDL2_LIBRARIES}
+		SDL2::SDL2-static
 		imgui
 )
 
 target_include_directories(imgui_sdl 
     PUBLIC 
         imgui_sdl
-        ${SDL2_INCLUDE_DIRS}
 )
 

libs/SDL

@@ -0,0 +1 @@
+Subproject commit 879af7b5c82c4d77a767a280e4c003db2ac64144

source/CMakeLists.txt

@@ -27,11 +27,16 @@ set(SRC
     Rock.cpp
     Rock.h
 
+    Apple.cpp
+    Apple.h
+
     MyTypes.h
     Settings.h
     Systems.h
 )
 
+find_package(OpenGL REQUIRED)
+
 add_executable(${CMAKE_PROJECT_NAME} WIN32 ${SRC})
 
 target_include_directories(${CMAKE_PROJECT_NAME} 
@@ -43,26 +48,9 @@ target_include_directories(${CMAKE_PROJECT_NAME}
 target_link_libraries(${CMAKE_PROJECT_NAME} 
     PUBLIC
         ${IMGui_LIBRARIES}
+        ${OPENGL_LIBRARIES}
         SDL2_ttf::SDL2_ttf-static
         imgui_sdl
-        #glad
 )
 
 set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-if (UNIX)
-    target_compile_definitions(${CMAKE_PROJECT_NAME} 
-        PUBLIC 
-            UNIX
-    )
-endif (UNIX)
-
-if (WIN32)
-    string(REGEX REPLACE "\\.[^.]*$" "" SDL2_LIB ${SDL2_LIBRARY})
-    get_filename_component(SDL2_NAME ${SDL2_LIBRARY} NAME)
-    string(REGEX REPLACE "\\.[^.]*$" "" SDL2_NAME ${SDL2_NAME})
-    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Debug ${CMAKE_CURRENT_BINARY_DIR}/Release)
-	file(COPY_FILE ${SDL2_LIB}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/Debug/${SDL2_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ONLY_IF_DIFFERENT)
-    file(COPY_FILE ${SDL2_LIB}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/Release/${SDL2_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ONLY_IF_DIFFERENT)
-    message(STATUS "COPY ${SDL2_LIB}${CMAKE_SHARED_LIBRARY_SUFFIX} -> ${CMAKE_CURRENT_BINARY_DIR}/{Debug,Release}/${SDL2_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-endif()

source/Main.cpp

@@ -21,7 +21,7 @@
 
 #include "Main.h"
 
-#ifdef UNIX
+#if !defined(_WIN32)
 
 uint32_t GetTickCount() {
 	struct timespec ts;
@@ -64,7 +64,7 @@ void InitSDL()
 }
 
 
-#ifndef UNIX
+#if defined(_WIN32)
 int APIENTRY wWinMain(_In_ HINSTANCE hInstance,	_In_opt_ HINSTANCE hPrevInstance,	_In_ LPWSTR    lpCmdLine,	_In_ int       nCmdShow)
 #else
 int main(int argc, char* argv[])

source/Main.h

@@ -2,13 +2,8 @@
 
 
 
-#ifndef UNIX
+#if defined(_WIN32)
 #include <windows.h>
-
-//Libs
-#pragma comment ( lib, "Winmm.Lib")
-#pragma comment ( lib, "Version.lib")
-#pragma comment ( lib, "Setupapi.lib")
 #else
 #include <cstdint>
 #define _In_