diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a8a16d2..0000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -dist: bionic - -language: cpp - -addons: - apt: - update: true - packages: - - cmake - - libtool - - autoconf - - libfreetype6-dev - - libgl1-mesa-dev - - libglew-dev - - libncurses5-dev - - libglm-dev - - libboost-all-dev - - libasound2-dev - - libasound2-plugins - - alsa-utils - -matrix: - include: - - os: linux - compiler: gcc - script: - - make - - os: windows - script: - - choco install innoextract grep - - set -e - - ./make.bat diff --git a/CMakeLists.txt b/CMakeLists.txt index 6002c39..c093307 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,6 +327,12 @@ function(find_boost) IMPORTED_LOCATION ${boost_iostreams_REL}) endfunction() +function(generate_glad_headers) + #glad --out-path src/glad --profile="compatibility" --api="gl=3.1" --generator="c" --spec="gl" --extensions="" --reproducible + #glad --out-path src/glad --api="wgl=1.0" --generator="c" --spec="wgl" --extensions="WGL_ARB_extensions_string,WGL_EXT_extensions_string" --reproducible + #glad --out-path src/glad --api="glx=1.4" --generator="c" --spec="glx" --extensions="GLX_ARB_create_context,GLX_EXT_visual_info" --reproducible +endfunction() + cmake_language(CALL build_glyphy) cmake_language(CALL build_librocket) cmake_language(CALL build_libsgfcplusplus) @@ -549,8 +555,8 @@ else() ) set(RELEASE_DIR ${PROJECT_SOURCE_DIR}/publish/Goban) - #file(COPY ${PROJECT_SOURCE_DIR}/data DESTINATION ${RELEASE_DIR}) - #file(COPY ${PROJECT_SOURCE_DIR}/engine DESTINATION ${RELEASE_DIR}) + file(COPY ${PROJECT_SOURCE_DIR}/data DESTINATION ${RELEASE_DIR}) + file(COPY ${PROJECT_SOURCE_DIR}/engine DESTINATION ${RELEASE_DIR}) install(DIRECTORY DESTINATION ${RELEASE_DIR}) install(TARGETS ${PROJECT_NAME} diff --git a/Makefile b/Makefile deleted file mode 100644 index e7c69d7..0000000 --- a/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -all: dependencies build - cd build && make -j4 - -dependencies: - make -j4 -C deps - -build: FORCE - mkdir -p build && cd build && \ - cmake .. && make -j4 && cd .. - ln -fs build/goban . - -glad: - glad --out-path src/glad --profile="compatibility" --api="gl=3.1" --generator="c" --spec="gl" --extensions="" --reproducible - glad --out-path src/glad --api="wgl=1.0" --generator="c" --spec="wgl" --extensions="WGL_ARB_extensions_string,WGL_EXT_extensions_string" --reproducible - glad --out-path src/glad --api="glx=1.4" --generator="c" --spec="glx" --extensions="GLX_ARB_create_context,GLX_EXT_visual_info" --reproducible - -FORCE: ; diff --git a/deps/Makefile b/deps/Makefile deleted file mode 100644 index d1cb103..0000000 --- a/deps/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -all: libRocket glyphy - -libRocket: - git clone https://github.com/popojan/libRocket.git - cd libRocket && git checkout rem-fix && mkdir -p buildDir && cd buildDir && cmake ../Build -DBUILD_SHARED_LIBS=0 && make - -glyphy: - git clone https://github.com/behdad/glyphy.git - cd glyphy && ./autogen.sh && ./configure --enable-static && make diff --git a/engine/install-engines b/engine/README.md old mode 100755 new mode 100644 similarity index 100% rename from engine/install-engines rename to engine/README.md diff --git a/make.bat b/make.bat deleted file mode 100644 index fe466c2..0000000 --- a/make.bat +++ /dev/null @@ -1,39 +0,0 @@ -REM choco install git wget 7zip cmake -REM choco install visualstudio2017buildtools -REM choco install visualstudio2017-workload-vctools -REM #choco install visualstudio2017-workload-universalbuildtools -REM choco install windows-sdk-10 -REM choco install innoextract - -set MSBUILD_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin" -set CMAKE_PATH="C:\Program Files\CMake\bin" -set PATH=%CMAKE_PATH%;%MSBUILD_PATH%;%PATH% -set STUDIO="Visual Studio 15 2017 Win64" - -set PROJECT_DIR=%~dp0 -set PROJECT_DIR=%PROJECT_DIR:~0,-1% - -if "%DEBUG%" == "1" ( - set BUILD_TYPE=Debug -) -else ( - set BUILD_TYPE=Release -) - -cd %PROJECT_DIR% -mkdir %BUILD_DIR% -cd %BUILD_DIR% - -cmake -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -G%STUDIO% --config=%BUILD_TYPE% %PROJECT_DIR% - -cmake -v --build . - -if %ERRORLEVEL% EQU 0 ( - cmake --install . - cd %PROJECT_DIR% - echo Success -) else ( - cd %PROJECT_DIR% - echo Failure %ERRORLEVEL% - exit /b %ERRORLEVEL% -)