Code

add cmake for Win and Linux#363

Code

Merged

dcvz merged 157 commits intoHarbourMasters:develop-zhoraHarbourMasters/Shipwright:develop-zhorafrom th-2021:developth-2021/Shipwright-cmake:developCopy head branch name to clipboardAug 5, 2022

+5,852-8,906

Commits

Commits on Aug 3, 2022

• add cmake for Win and Linux

  th-2021

  committed
  62ea9ff

• fix some compilation issues

  

  Thomas Hiller

  authored and

  th-2021

  committed
  31321bd

• add libdl

  

  Thomas Hiller

  authored and

  th-2021

  committed
  e0c0c55

• rename ZAPD to ZAPD.out for compatibility with OTRGui

  th-2021

  committed
  a7b0b08

• add utility functions

  th-2021

  committed
  a131801

• ad OTRGui

  th-2021

  committed
  69bf035

• fix for Linux

  th-2021

  committed
  e7b3639

• fix embedded escaped space

  th-2021

  committed
  a409457

• fix dependencies; add language standard

  th-2021

  committed
  92080e2

• correct dependencies; add floating options for Linux

  th-2021

  committed
  75bf1d4

• sync with main repo

  th-2021

  committed
  978b3ec

• add CMakeLists.txt

  th-2021

  committed
  209844a

• fix stormlib

  th-2021

  committed
  8c1651a

• fix stormlib

  th-2021

  committed
  71873f2

• add SaveManager

  th-2021

  committed
  ccb90c5

• remove git clone StormLib

  th-2021

  committed
  16dceb8

• enable Clang (first step)

  th-2021

  committed
  28c05ef

• Fix cmake files for macos

  th-2021

  committed
  71eb54d

• fix Windows build

  th-2021

  committed
  f5dd34a

• cleanup

  th-2021

  committed
  48306ba

• cleanup

  th-2021

  committed
  46a2ca7

• fix typo

  th-2021

  committed
  9b1b383

• add Linux to Fast3D extra

  th-2021

  committed
  c541009

• renamed some files

  th-2021

  committed
  12a396d

• more cleanup

  th-2021

  committed
  ff89a32

• add install target

  th-2021

  committed
  856cff5

• fix typos

  th-2021

  committed
  e5dd950

• fix typos

  th-2021

  committed
  cdc8d4a

• fix spaces

  th-2021

  committed
  b40bfe6

• remove Fortran

  th-2021

  committed
  833cef4

• cleanup

  th-2021

  committed
  9f69eb3

• add top-level file

  th-2021

  committed
  0ca5695

• add packaging

  th-2021

  committed
  371972f

• formatting

  th-2021

  committed
  e15633b

• correct Windows lineage

  th-2021

  committed
  6ce51c7

• add gamecontrollerdb.txt

  th-2021

  committed
  54f343a

• fixes for Windows 64 bit and packaging

  th-2021

  committed
  4237600

• fix typo

  th-2021

  committed
  2bbea86

• no LICENSE

  th-2021

  committed
  2c9f16c

• remove Debug clause

  th-2021

  committed
  a947761

• fix win64 build

  th-2021

  committed
  77c4ba8

• fix typo

  th-2021

  committed
  ed80aa5

• add include dir

  th-2021

  committed
  ee851e6

• add CosmeticsEditor

  th-2021

  committed
  d1b1356

• update

  th-2021

  committed
  6183e73

• fix extract asses on Windows

  th-2021

  committed
  7c099ef

• replace build-cmake with CMAKE_BINARY_DIR

  th-2021

  committed
  558b439

• change Linux build to Ninja

  th-2021

  committed
  54fdec3

• glew update, appimage update

  th-2021

  committed
  fbf50d3

• update BUILDING-cmake.md

  th-2021

  committed
  cd12ad4

• fix win32 lib path

  th-2021

  committed
  2fda3fc

• fix linuxdeploy in container; added CMAKE_SOURCE_DIR to glew

  th-2021

  committed
  07014bc

• update to 3.0.0

  th-2021

  committed
  d510ae4

• updated Windows part

  th-2021

  committed
  5559ebb

• clarify classical build

  th-2021

  committed
  d15563c

• update to main; add MacOS

  th-2021

  committed
  e0545ba

• fix typo

  th-2021

  committed
  c5fae24

• Get macOS to compile

  

  dcvz

  authored and

  th-2021

  committed
  413c667

• small fixes

  th-2021

  committed
  7f8f775

• [macos] intermediate binary with arch name

  

  dcvz

  authored and

  th-2021

  committed
  932d827

• more packaging fixes

  th-2021

  committed
  c39b858

• more packaging fixes

  th-2021

  committed
  3a49262

• more packaging fixes

  th-2021

  committed
  ece42f9

• fixup_bundle only on MacOS

  th-2021

  committed
  d0a2b1b

• small appimage fix

  th-2021

  committed
  76f8c82

• small appimage fix

  th-2021

  committed
  45cc3e0

• Fix macos bundling and lib bundling

  

  dcvz

  authored and

  th-2021

  committed
  f6a35e4

• [macos] don’t include linux files

  

  dcvz

  authored and

  th-2021

  committed
  1af2a93

• use startup script for MacOS bundle

  th-2021

  committed
  f41baad

• fix packaging on MacOS

  th-2021

  committed
  921be85

• adjust Windows zip

  

  Thomas Hiller

  authored and

  th-2021

  committed
  e2fd092

• delete oot.otr before generating new

  th-2021

  committed
  61f73b5

• integrate vcpkg build

  th-2021

  committed
  c3a94da

• integrate vcpkg build

  th-2021

  committed
  ea164d7

• search python also at {env.PYTHON}

  th-2021

  committed
  18b714a

• need to check for Python3

  th-2021

  committed
  0380388

• Add distribution of LInux & macOS

  th-2021

  committed
  46eb4a0

• Update Dockerfile

  th-2021

  committed
  ce71896

• Update Dockerfile

  th-2021

  committed
  0fc4bbe

• Update Dockerfile

  th-2021

  committed
  bdf8b98

• Update Dockerfile

  th-2021

  committed
  a9d8397

• Update Dockerfile

  th-2021

  committed
  b72ee3d

• Update Dockerfile

  th-2021

  committed
  a394e86

• Update Dockerfile

  th-2021

  committed
  3d6be6b

• Update Dockerfile

  th-2021

  committed
  aae221e

• Update Dockerfile

  th-2021

  committed
  e8cf13c

• Update Dockerfile

  th-2021

  committed
  545780e

• Update Jenkinsfile to cd into build folder

  

  dcvz

  authored and

  th-2021

  committed
  959e05b

• Fix cpack command

  

  dcvz

  authored and

  th-2021

  committed
  91160ce

• Update the appimage scripts

  th-2021

  committed
  c47b48f

• Build windows cmake on Jenkins

  

  dcvz

  authored and

  th-2021

  committed
  536ef68

• set python path for Windows

  

  dcvz

  authored and

  th-2021

  committed
  5d5388e

• install python via vcpkg

  

  dcvz

  authored and

  th-2021

  committed
  65f8ec4

• Try to fix python path

  

  dcvz

  authored and

  th-2021

  committed
  acd5e67

• Try new flag for windows python spec

  

  dcvz

  authored and

  th-2021

  committed
  2054ad5

• Remove installation of python3

  

  dcvz

  authored and

  th-2021

  committed
  c45a960

• windows: COPY rom file

  

  dcvz

  authored and

  th-2021

  committed
  a9d5030

• Use ninja on macOS

  

  dcvz

  authored and

  th-2021

  committed
  9751835

• rename scripts/linux to scripts/linux/appimage

  th-2021

  committed
  896198d

• rename scripts/linux to scripts/linux/appimage

  th-2021

  committed
  dce60c1

• BULDING-cmake update

  th-2021

  committed
  64ca3eb

• correct path to linux build script

  th-2021

  committed
  858a855

• set VS startup project

  th-2021

  committed
  e7a83d2

• create assets only once

  th-2021

  committed
  3deea36

• only copy assets for OTRGui

  th-2021

  committed
  909e5b7

• Fix macos artififact path

  

  dcvz

  authored and

  th-2021

  committed
  394afd7

• Add verbosity for further logging

  

  dcvz

  authored and

  th-2021

  committed
  af389cf

• Try changing output path

  

  dcvz

  authored and

  th-2021

  committed
  41fd1cd

• Fix path of appimge

  

  dcvz

  authored and

  th-2021

  committed
  4090b6a

• pathconf for NintendoSwitch

  th-2021

  committed
  55e57e5

• add Nintendo Switch

  th-2021

  committed
  bd5e4be

• fix typo

  th-2021

  committed
  e9b74db

• remove Environment

  th-2021

  committed
  a272354

• remove color.h

  th-2021

  committed
  453f6e0

• fix MATCHES

  th-2021

  committed
  3029cb0

• comment out Intel sse2 option

  th-2021

  committed
  1d431f7

• add switch support

  th-2021

  committed
  0922169

• ZAPD.out also on Darwin

  th-2021

  committed
  9ee88ff

• use instead of cmake

  th-2021

  committed
  38ef459

• check for curl

  th-2021

  committed
  62a6d76

• conditionally add Intel CPU option SSE2

  th-2021

  committed
  a70077d

• Fix Dockerfile & Jenkins (#5)

  dcvz

  authored
  2128926

• add -O3 -ffast-math for Nintendo Switch

  th-2021

  committed
  243f8be

• Build universally on macOS

  dcvz

  committed
  0ca1843

• use CMAKE_BUILD_TYPE

  th-2021

  committed
  79cc45a

• Update building instructions

  dcvz

  committed
  5fdb2cd

• set default to Debug

  th-2021

  committed
  6057ad6

• use_props only on Windows - for now

  th-2021

  committed
  f0a99df

• Add ninja to macOS requirements

  dcvz

  authored
  ca96b05

Commits on Aug 4, 2022

• Remove Makefiles & VS solutions

  dcvz

  committed
  5e8168f

• Update instructions to use multiple cores

  dcvz

  committed
  85ddb4d

• Remove custom gcc mac toolchain

  dcvz

  committed
  e49fe05

• Use ninja to build directly

  dcvz

  committed
  edcd39d

• Update macos requirements

  dcvz

  committed
  3d7521f

• Add tip about VSC

  dcvz

  committed
  db57579

• remove assets_created; copy oot.otr file

  th-2021

  committed
  fc66066

• Revert "Use ninja to build directly"

  Show description for ad4d58f
  dcvz

  committed
  ad4d58f

• Rely on Ninja’s multithreadedness

  dcvz

  committed
  92334c9

• Extra big warning about ninja tools

  dcvz

  committed
  e032974

• Add missing step for generating assets before building

  dcvz

  committed
  c0780c5

• Document clean command

  dcvz

  committed
  0712398

• replace Release with CMAKE_BUILD_TYPE in ExtractAssets

  th-2021

  committed
  6f678c6

• Add release builds in Jenkins

  dcvz

  committed
  655590e

• Fix macOS release build issue

  dcvz

  committed
  08d54b2

• [windows] Extract assets before building

  dcvz

  committed
  ed506fc

• Update gitignore

  dcvz

  committed
  0d0b516

• Add more updates

  dcvz

  committed
  ccb49de

• Add more details on developing SoH

  dcvz

  authored
  60e0bd8

• Make navigating more clear for Windows

  dcvz

  committed
  3e75a07

• Try experimental multithreading

  dcvz

  committed
  a2d1783

• Fix build type

  dcvz

  committed
  0ec3578

• Merge branch 'develop-zhora' into feature/cmake

  Show description for ab5771d
  dcvz

  committed
  ab5771d

• Fix merge issues

  dcvz

  committed
  19a35ba

• Fix typo in BUILDING.md

  dcvz

  authored
  2d97834

• Delete stray macos toolchain file

  dcvz

  committed
  708fd61

• Update windows note on using VSC

  dcvz

  committed
  f0d2cf0

Commits on Aug 5, 2022

• Merge branch 'develop-zhora' into feature/cmake

  Show description for a65af79
  dcvz

  committed
  a65af79