Started to remove the old cmake scripts. This means that Ubuntu 16.04…

… and older are no longer supported. Ubuntu 16.04 reached end of support a few months ago. Windows build seems to work. Standalone build needs to be worked on. Standalone builds will also get dropped 32 bit support, so it should be ok.
blockattack · Jun 7, 2021 · 00a2e90 · 00a2e90
1 parent 3cae600
commit 00a2e90
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 331 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 2.8.7)
 project (blockattack)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${blockattack_SOURCE_DIR}/source/misc/cmake")
 set(BIN_DIR ${blockattack_SOURCE_DIR}/Game)
 
 SET(CPACK_PACKAGE_VERSION "2.7.0-SNAPSHOT")
@@ -63,7 +62,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-fallthrough")
 
 #Setup SDL2
 find_package(SDL2 REQUIRED)
-include_directories(${SDL2_INCLUDE_DIR})
+include_directories(${SDL2_INCLUDE_DIRS})
 
 #Setup things that use pkg-config
 find_package(PkgConfig REQUIRED)
@@ -91,7 +90,7 @@ include_directories("source/code/Libs/include/cereal/external")  #Contains rapid
 
 #building/compiling/linking
 add_executable(blockattack ${GUI_TYPE} ${SOURCES} ${RES_FILES})
-target_link_libraries( blockattack ${SDL2_LIBRARY})
+target_link_libraries( blockattack ${SDL2_LIBRARIES})
 target_link_libraries( blockattack physfs)
 target_link_libraries( blockattack ${SDL2MIXER_LIBRARIES} ${SDL2IMAGE_LIBRARIES} ${SDL2TTF_LIBRARIES})
 target_link_libraries( blockattack ${Boost_LIBRARIES} )

diff --git a/source/misc/cmake/FindSDL2.cmake b/source/misc/cmake/FindSDL2.cmake
diff --git a/source/misc/cmake/LibFindMacros.cmake b/source/misc/cmake/LibFindMacros.cmake
diff --git a/source/misc/docker/Dockerfile.Ubuntu16.04build b/source/misc/docker/Dockerfile.Ubuntu16.04build
diff --git a/...e/misc/docker/Dockerfile.Ubuntu14.04build → ...e/misc/docker/Dockerfile.Ubuntu18.04build b/...e/misc/docker/Dockerfile.Ubuntu14.04build → ...e/misc/docker/Dockerfile.Ubuntu18.04build
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -yy build-essential libphysfs-dev libboost-dev cmake libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libboost-program-options-dev libutfcpp-dev zip gettext
 

diff --git a/source/misc/standalone/build_standalone.sh b/source/misc/standalone/build_standalone.sh
@@ -39,6 +39,9 @@ cp /staging/blockattack-game/man/blockattack.man /output/docs/ && \
 cp /staging/blockattack-game/README.md /output/docs/README_ORG.md && \
 chown -R 1000 /output"
 
+exit 0
+# Following is from the old 32-bit build
+
 scp source/misc/standalone/compile_requirements.sh blockattack_build:/
 scp source/misc/standalone/install_requirements.sh blockattack_build:/
 ssh blockattack_build /install_requirements.sh