Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

switch-next: Build with CMake #334

Merged
merged 13 commits into from
Oct 13, 2019
Merged

switch-next: Build with CMake #334

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c765a39
Update CMake/Findsodium.cmake from upstream
glebm Oct 6, 2019
8a53754
CMake/Findsodium.cmake: Support "Generic" platform
glebm Oct 6, 2019
ef93b69
Switch port: Code changes for latest devkitpro
glebm Oct 7, 2019
795ef06
Switch: Build with CMake
glebm Oct 7, 2019
0c77100
Merge branch 'switch-next' into switch-next
AJenbo Oct 9, 2019
8c54c45
Update config.yml
AJenbo Oct 9, 2019
6ea9d84
Merge branch 'switch-next' into switch-next
AJenbo Oct 9, 2019
a18d11d
Delete makefile
AJenbo Oct 9, 2019
d5ca707
Switch CircleCI: Build with LTO
glebm Oct 10, 2019
37a1a02
CMake: Move project definition above the LTO check
glebm Oct 10, 2019
5ceaac2
switch/build.sh: Fewer devkitpro packages
glebm Oct 12, 2019
a660eeb
CMakeLists.txt: Use -fPIE for the switch build
glebm Oct 12, 2019
23f617a
Merge branch 'switch-next' into switch-next
AJenbo Oct 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,14 @@ jobs:
working_directory: ~/repo
steps:
- checkout
- run: make -j$(nproc)
- store_artifacts: {path: ./release/devilutionx.nro, destination: devilutionx.nro}
- run: echo deb http://deb.debian.org/debian stretch-backports main > /etc/apt/sources.list.d/debian-backports.list
- run: apt-get update && apt-get install -y -t stretch-backports cmake
# Install cmake files (https://github.com/devkitPro/docker/issues/3)
- run: dkp-pacman -S --needed --noconfirm --quiet devkitpro-pkgbuild-helpers
# NOTE: Doesn't link without LTO ("read-only segment has dynamic relocations").
- run: cd build && cmake .. -DBINARY_RELEASE=ON -DNONET=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/switch/devkita64-libnx.cmake
- run: cd build && cmake --build . -j $(nproc)
- store_artifacts: {path: ./build/devilutionx.nro, destination: devilutionx.nro}

workflows:
version: 2
Expand Down
3 changes: 2 additions & 1 deletion 3rdParty/StormLib/src/StormPort.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <strings.h>
#include <ctype.h>
#include <assert.h>
#include <errno.h>
Expand Down Expand Up @@ -271,7 +272,7 @@
#endif // !PLATFORM_WINDOWS

// 64-bit calls are supplied by "normal" calls on Mac
#if defined(PLATFORM_MAC) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_NX)
#if defined(PLATFORM_MAC) || defined(PLATFORM_HAIKU) || defined(PLATFORM_AMIGA) || defined(PLATFORM_SWITCH)
#define stat64 stat
#define fstat64 fstat
#define lseek64 lseek
Expand Down