Windows DLLs and (not working) windows build support

This commit is contained in:
plane000
2018-11-28 20:16:33 +00:00
parent 63ec7cc955
commit b7305b33c6
9 changed files with 38 additions and 5 deletions

7
.gitignore vendored
View File

@@ -1,5 +1,10 @@
CMakeFiles/
# CMakeFiles/
CMakeCache.txt
build/
Win32/
cmake_install.cmake
Makefile
crumpet-engine.sln
CMakeFiles/
*.vcxproj
*.vcxproj.filters

View File

@@ -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}
)

BIN
bin/SDL2.dll Normal file

Binary file not shown.

BIN
bin/libjpeg-9.dll Normal file

Binary file not shown.

BIN
bin/libpng16-16.dll Normal file

Binary file not shown.

BIN
bin/libtiff-5.dll Normal file

Binary file not shown.

BIN
bin/libwebp-7.dll Normal file

Binary file not shown.

BIN
bin/zlib1.dll Normal file

Binary file not shown.

10
sdl2-config.cmake Normal file
View File

@@ -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)