1
0
Fork 0

get back the most minimun requirements for 2.0.3 to 2.0.1

* rollback partially bbd89e8332
* set game repo to minenux default game minetest
main-2-0-3
mckaygerhard 2022-12-28 15:04:06 -04:00
parent 78d9ec0f2a
commit c4c8612268
7 changed files with 10 additions and 11 deletions

1
.gitattributes vendored
View File

@ -1,3 +1,2 @@
* text=auto
*.cpp diff=cpp
*.h diff=cpp

View File

@ -21,7 +21,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11

View File

@ -9,7 +9,7 @@ stages:
- deploy
variables:
MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
MINETEST_GAME_REPO: "https://codeberg.org/minenux/minetest-game-minetest.git"
CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
.build_template:

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.0)
cmake_policy(SET CMP0025 OLD)
@ -6,9 +6,8 @@ cmake_policy(SET CMP0025 OLD)
project(multicraft)
set(PROJECT_NAME_CAPITALIZED "MultiCraft")
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(GCC_MINIMUM_VERSION "5.1")
set(CMAKE_CXX_STANDARD 11)
set(GCC_MINIMUM_VERSION "4.7")
set(CLANG_MINIMUM_VERSION "3.5")
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
@ -20,7 +19,7 @@ set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
# Change to false for releases
set(DEVELOPMENT_BUILD FALSE)
set(ENABLE_UPDATE_CHECKER (NOT ${DEVELOPMENT_BUILD}) CACHE BOOL
set(ENABLE_UPDATE_CHECKER FALSE CACHE BOOL
"Whether to enable update checks by default")
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")

View File

@ -1,6 +1,6 @@
FROM alpine:3.14
ENV MINETEST_GAME_VERSION master
ENV MINETEST_GAME_VERSION original-2.0.3
COPY .git /usr/src/multicraft/.git
COPY CMakeLists.txt /usr/src/multicraft/CMakeLists.txt
@ -22,7 +22,7 @@ RUN apk add --no-cache git build-base irrlicht-dev cmake bzip2-dev libpng-dev \
jpeg-dev libxxf86vm-dev mesa-dev sqlite-dev libogg-dev \
libvorbis-dev openal-soft-dev curl-dev freetype-dev zlib-dev \
gmp-dev jsoncpp-dev postgresql-dev luajit-dev ca-certificates && \
git clone --depth=1 -b ${MINETEST_GAME_VERSION} https://github.com/minetest/minetest_game.git ./games/minetest_game && \
git clone --depth=1 -b ${MINETEST_GAME_VERSION} https://codeberg.org/minenux/minetest-game-minetest.git ./games/minetest_game && \
rm -fr ./games/minetest_game/.git
WORKDIR /usr/src/

View File

@ -62,7 +62,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} -O1 -g")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_WITHDEBINFO} -O2 -g")
endif(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
add_subdirectory(src build)

View File

@ -737,6 +737,7 @@ if(MSVC)
endif()
else()
# GCC or compatible compilers such as Clang
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
if(WARN_ALL)
set(RELEASE_WARNING_FLAGS "-Wall")
else()