Skip to content

Commit 181a0af

Browse files
committed
adjustments for macos
1 parent 3de04a9 commit 181a0af

File tree

5 files changed

+57
-67
lines changed

5 files changed

+57
-67
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
exclude:
109109
- build-config: release
110110
steam-sockets: ON
111-
- build-arch: "-arm" # temporarily disable all tests on arm - tests with gcc fail at runtiime
111+
- build-arch: "-arm" # temporarily disable all tests on arm - tests with gcc fail at runtime
112112

113113
steps:
114114
- name: Install packages

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ Cage is game engine/framework designed for programmers with focus on ease of use
107107
- Image info - print information about an image
108108
- Image resize - batch resizing of images
109109
- Image untile - slices a single image with tiled sections into a sequence of individual images
110-
- Mesh info - print information about a mesh
110+
- Mesh convert - converts models from several interchange formats to glb + png, and optionally creates configuration for Cage assets
111+
- Mesh info - print information about a 3D model
111112

112113
# Building
113114

sources/libcore/filesystem/realWatcher.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ namespace cage
8484

8585
Holder<FilesystemWatcher> newFilesystemWatcher()
8686
{
87+
#ifdef CAGE_SYSTEM_MAC
88+
CAGE_LOG(SeverityEnum::Warning, "filesystemWatcher", "filesystem watcher on macos reports paths that are inconsistent with other platforms, and might be broken - it is excluded from tests");
89+
#endif // CAGE_SYSTEM_MAC
8790
return systemMemory().createImpl<FilesystemWatcher, FilesystemWatcherImpl>();
8891
}
8992
}

sources/libcore/network/ginnel.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,11 +1365,17 @@ namespace cage
13651365

13661366
Holder<GinnelConnection> newGinnelConnection(const String &address, uint16 port, uint64 timeout)
13671367
{
1368+
#ifdef CAGE_SYSTEM_MAC
1369+
CAGE_LOG(SeverityEnum::Warning, "ginnel", "ginnel on macos might be broken - it is excluded from tests");
1370+
#endif // CAGE_SYSTEM_MAC
13681371
return systemMemory().createImpl<GinnelConnection, GinnelConnectionImpl>(address, port, timeout);
13691372
}
13701373

13711374
Holder<GinnelServer> newGinnelServer(uint16 port)
13721375
{
1376+
#ifdef CAGE_SYSTEM_MAC
1377+
CAGE_LOG(SeverityEnum::Warning, "ginnel", "ginnel on macos might be broken - it is excluded from tests");
1378+
#endif // CAGE_SYSTEM_MAC
13731379
return systemMemory().createImpl<GinnelServer, GinnelServerImpl>(port);
13741380
}
13751381
}

0 commit comments

Comments
 (0)