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.

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

Macos #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ jobs:
cd build

echo "::group::CMake"
cmake .. -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ matrix.extra-cmake-parameters }}
cmake .. -DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ matrix.extra-cmake-parameters }} -DCMAKE_BUILD_TYPE=RelWithDebInfo
echo "::endgroup::"

echo "::group::Build"
Expand Down Expand Up @@ -247,6 +247,8 @@ jobs:
-DCMAKE_OSX_ARCHITECTURES=${{ matrix.full_arch }} \
-DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-osx \
-DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON \
# EOF
echo "::endgroup::"

Expand Down Expand Up @@ -320,6 +322,7 @@ jobs:
-GNinja \
-DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-windows-static \
-DCMAKE_TOOLCHAIN_FILE="c:\vcpkg\scripts\buildsystems\vcpkg.cmake" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
# EOF
echo "::endgroup::"

Expand Down Expand Up @@ -398,6 +401,7 @@ jobs:
cmake .. \
-GNinja \
-DCMAKE_CXX_FLAGS="-fuse-ld=lld" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
# EOF
echo "::endgroup::"

Expand Down
2 changes: 2 additions & 0 deletions src/3rdparty/squirrel/squirrel/sqstate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
*/

#include "../../../stdafx.h"
#pragma message(XSTR(assert(true)))

#include "sqpcheader.h"
#pragma message(XSTR(assert(true)))
#include "sqopcodes.h"
#include "sqvm.h"
#include "sqfuncproto.h"
Expand Down
2 changes: 2 additions & 0 deletions src/order_cmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
/** @file order_cmd.cpp Handling of orders. */

#include "stdafx.h"
#pragma message(XSTR(assert(true)))
#include "debug.h"
#pragma message(XSTR(assert(true)))
#include "command_func.h"
#include "company_func.h"
#include "news_func.h"
Expand Down
9 changes: 9 additions & 0 deletions src/road.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,23 @@
#ifndef ROAD_H
#define ROAD_H

#pragma message(XSTR(assert(true)))

Check warning on line 13 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 13, __func__),0))) [-W#pragma-messages]

Check warning on line 13 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/script/api/../../road.h", 13, __func__),0))) [-W#pragma-messages]

Check warning on line 13 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 13 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 13 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(13, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 13 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(13, "/home/runner/work/OpenTTD/OpenTTD/src/road.h", "true"); [-W#pragma-messages]

Check warning on line 13 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]

Check warning on line 13 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]
#include "road_type.h"
#pragma message(XSTR(assert(true)))

Check warning on line 15 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 15, __func__),0))) [-W#pragma-messages]

Check warning on line 15 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 15 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(15, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 15 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]
#include "gfx_type.h"
#pragma message(XSTR(assert(true)))

Check warning on line 17 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 17, __func__),0))) [-W#pragma-messages]

Check warning on line 17 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 17 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(17, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 17 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]
#include "core/bitmath_func.hpp"
#pragma message(XSTR(assert(true)))

Check warning on line 19 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 19, __func__),0))) [-W#pragma-messages]

Check warning on line 19 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 19 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(19, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 19 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]
#include "strings_type.h"
#pragma message(XSTR(assert(true)))

Check warning on line 21 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 21, __func__),0))) [-W#pragma-messages]

Check warning on line 21 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 21 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(21, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 21 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]
#include "timer/timer_game_calendar.h"
#pragma message(XSTR(assert(true)))

Check warning on line 23 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 23, __func__),0))) [-W#pragma-messages]

Check warning on line 23 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 23 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(23, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 23 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]
#include "core/enum_type.hpp"
#pragma message(XSTR(assert(true)))

Check warning on line 25 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 25, __func__),0))) [-W#pragma-messages]

Check warning on line 25 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 25 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(25, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 25 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]
#include "newgrf.h"
#pragma message(XSTR(assert(true)))

Check warning on line 27 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 27, __func__),0))) [-W#pragma-messages]

Check warning on line 27 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 27 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(27, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 27 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]
#include "economy_func.h"
#pragma message(XSTR(assert(true)))

Check warning on line 29 in src/road.h

View workflow job for this annotation

GitHub Actions / Emscripten

((void)((true) || (__assert_fail("true", "/__w/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", 29, __func__),0))) [-W#pragma-messages]

Check warning on line 29 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Release)

(static_cast<void> (0)) [-W#pragma-messages]

Check warning on line 29 in src/road.h

View workflow job for this annotation

GitHub Actions / Linux (Clang - Debug)

if (__builtin_expect(!!(!(true)), 0)) AssertFailedError(29, "/home/runner/work/OpenTTD/OpenTTD/src/3rdparty/squirrel/include/../../../road.h", "true"); [-W#pragma-messages]

Check warning on line 29 in src/road.h

View workflow job for this annotation

GitHub Actions / Mac OS (x64)

((void)0) [-W#pragma-messages]


enum RoadTramType : bool {
Expand Down
3 changes: 3 additions & 0 deletions src/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,9 @@ void NORETURN AssertFailedError(int line, const char *file, const char *expressi
# define assert(expression) if (unlikely(!(expression))) AssertFailedError(__LINE__, __FILE__, #expression);
#endif

#define XSTR(x) STR(x)
#define STR(x) #x

/* Define JSON_ASSERT, which is used by nlohmann-json. Otherwise the header-file
* will re-include assert.h, and reset the assert macro. */
#define JSON_ASSERT(x) assert(x)
Expand Down
2 changes: 2 additions & 0 deletions src/town_cmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
/** @file town_cmd.cpp Handling of town tiles. */

#include "stdafx.h"
#pragma message(XSTR(assert(true)))
#include "road.h"
#pragma message(XSTR(assert(true)))
#include "road_internal.h" /* Cleaning up road bits */
#include "road_cmd.h"
#include "landscape.h"
Expand Down
Loading