diff --git a/.gitignore b/.gitignore index 69b7f21..05a02f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,10 @@ -CMakeFiles/ +# CMakeFiles/ CMakeCache.txt build/ +Win32/ cmake_install.cmake Makefile +crumpet-engine.sln +CMakeFiles/ +*.vcxproj +*.vcxproj.filters diff --git a/CMakeLists.txt b/CMakeLists.txt index cdc7d47..7138c6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,10 +8,25 @@ set(SrcDIR src) set(EngineDIR ${SrcDIR}/crumpet-engine) set(IncludeDIR include) -find_package(SDL2 REQUIRED) +if (WIN32) + set(SDL2_PATH E:/Games/Librarys/SDL2-2.0.8) + set(SDL2_INCLUDE_DIR E:/Games/Librarys/SDL2-2.0.8/include) + set(SDL2_LIBRARY E:/Games/Librarys/SDL2-2.0.8/lib/x64) + set(SDL2_IMAGE_INCLUDE_DIR E:/Games/Librarys/SDL2_image-2.0.4/VisualC/external/include) + set(SDL2_IMAGE_LIBRARIES E:/Games/Librarys/SDL2_image-2.0.4/VisualC/external/lib/x64) +endif (WIN32) -include_directories(${BuildDIR}/ ${SDL_INCLUDE_DIR}) -include_directories(${BuildDIR}/ ${IncludeDIR}) +if (UNIX) + find_package(SDL2 REQUIRED) + find_package(SDL2_image REQUIRED) +endif (UNIX) + +include_directories( + ${SDL2_INCLUDE_DIR} + ${SDL2_IMAGE_INCLUDE_DIR} +) + +include_directories(${IncludeDIR}) file(GLOB_RECURSE SourceFiles ${SrcDIR}/* @@ -21,4 +36,7 @@ file(GLOB_RECURSE SourceFiles ) add_executable(${BuildDIR}/${EXEName} ${SourceFiles}) -target_link_libraries(${BuildDIR}/${EXEName} ${SDL2_LIBRARIES}) +target_link_libraries(${BuildDIR}/${EXEName} + ${SDL2_LIBRARY} + ${SDL2_IMAGE_LIBRARIES} +) diff --git a/bin/SDL2.dll b/bin/SDL2.dll new file mode 100644 index 0000000..6cf858c Binary files /dev/null and b/bin/SDL2.dll differ diff --git a/bin/libjpeg-9.dll b/bin/libjpeg-9.dll new file mode 100644 index 0000000..f4a6fea Binary files /dev/null and b/bin/libjpeg-9.dll differ diff --git a/bin/libpng16-16.dll b/bin/libpng16-16.dll new file mode 100644 index 0000000..106bd21 Binary files /dev/null and b/bin/libpng16-16.dll differ diff --git a/bin/libtiff-5.dll b/bin/libtiff-5.dll new file mode 100644 index 0000000..fefe533 Binary files /dev/null and b/bin/libtiff-5.dll differ diff --git a/bin/libwebp-7.dll b/bin/libwebp-7.dll new file mode 100644 index 0000000..19bea3b Binary files /dev/null and b/bin/libwebp-7.dll differ diff --git a/bin/zlib1.dll b/bin/zlib1.dll new file mode 100644 index 0000000..e7493de Binary files /dev/null and b/bin/zlib1.dll differ diff --git a/sdl2-config.cmake b/sdl2-config.cmake new file mode 100644 index 0000000..4c5eaa6 --- /dev/null +++ b/sdl2-config.cmake @@ -0,0 +1,10 @@ +set(SDL2_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/include") + +# Support both 32 and 64 bit builds +if (${CMAKE_SIZEOF_VOID_P} MATCHES 8) + set(SDL2_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x64/SDL2main.lib") +else () + set(SDL2_LIBRARIES "${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2.lib;${CMAKE_CURRENT_LIST_DIR}/lib/x86/SDL2main.lib") +endif () + +string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)