Skip to content
Permalink
Browse files

Merge pull request #1611 from Cxbx-Reloaded/cmake

Use CMake build-system
  • Loading branch information...
LukeUsher committed May 15, 2019
2 parents 55c015c + 6d752b6 commit 6a29876b5eb4348e31e49515d4b5d07092070ef1
@@ -17,3 +17,6 @@
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain

[Cc][Mm]ake[Ll]ists.txt text=lf
*.bat text=lf
@@ -1,115 +1,13 @@
# Compiled Object files
*.slo
*.lo
*.o
# Build folders
[Bb]uild/
[Bb]uild-*/

# Compiled Dynamic libraries
*.so
*.dylib

# Compiled Static libraries
*.lai
*.la
*.a

#OS junk files
[Tt]humbs.db
*.DS_Store

#Documentation output
doc/doxygen/html

#Export
export

#Visual Studio files
*.[Oo]bj
*.user
# Generated files
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.ilk
*.log
*.sbr
*.sdf
*.opensdf
*.unsuccessfulbuild
obj/
[Bb]in
build/win32/[Dd]ebug*/
build/win32/[Rr]elease*/
build/win32/Win32/
build/win32/Cxbx.ChildProcessDbgSettings
Build/win32/ipch/
Ankh.NoLoad
*.ChildProcessDbgSettings

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Visual Studio 2015/2017 cache files
.vs/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

#MonoDevelop
*.pidb
*.userprefs

#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
*.sass-cache

#Subversion files
.svn

# Office Temp Files
~$*

#NuGet
packages/

#ncrunch
*ncrunch*
*crunch*.local.xml

# visual studio database projects
*.dbmdl

#Test files
*.testsettings
src/Version.h
*.opendb
*.db
src/[Vv]ersion.h
*.xbe
*.ipch
*.db-shm
*.db-wal

# Last known git hash
LAST_GIT_VERSION
@@ -4,12 +4,9 @@
[submodule "import/cs_x86"]
path = import/cs_x86
url = https://github.com/x1nixmzeng/cs_x86
[submodule "import/d3d8to9"]
path = import/d3d8to9
url = https://github.com/Cxbx-Reloaded/d3d8to9
[submodule "import/XbSymbolDatabase"]
path = import/XbSymbolDatabase
url = https://github.com/Cxbx-Reloaded/XbSymbolDatabase.git
url = https://github.com/Cxbx-Reloaded/XbSymbolDatabase
[submodule "import/simpleini"]
path = import/simpleini
url = https://github.com/brofield/simpleini
@@ -0,0 +1,47 @@
language: cpp

git:
submodules: true
depth: 1

matrix:
include:
- os: windows
env: configuration=Debug
- os: windows
env: configuration=Release

before_script:
- if [ $TRAVIS_OS_NAME == 'windows' ]; then
export PATH="c:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin":$PATH;
mkdir build;
cd build;
cmake .. -G "Visual Studio 15 2017" -A Win32;
fi

script:
- if [ $TRAVIS_OS_NAME == 'windows' ]; then
cmake --build . --config ${configuration};
fi

# Bug with the Windows builder requires us to not filter secrets
#filter_secrets: false

#before_deploy:
# - mkdir export
# - 7z u export/${configuration} COPYING README.md
# - cd build/win32/${configuration}
# - 7z u ../../../export/${configuration} Cxbx.exe glew32.dll subhook.dll CxbxVSBC.dll
# - 7z u ../../../export/${configuration} CxbxDebugger.exe capstone.dll cs_x86.dll
# - cd ../../../

#deploy:
# provider: releases
# api_key: $GH_TOKEN
# file: "export/${configuration}.7z"
# skip_cleanup: true
# on:
# # Can disable this to deploy all builds appears as "untagged-buildhash" on GH
# tags: true
# branch: develop
# condition: $configuration = Release
Oops, something went wrong.

0 comments on commit 6a29876

Please sign in to comment.
You can’t perform that action at this time.