Skip to content

Commit

Permalink
WIP: Mac support (thanks @mhsjlw)
Browse files Browse the repository at this point in the history
  • Loading branch information
MCMrARM committed Jul 2, 2018
1 parent 237107a commit dcb1725
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,9 @@
[submodule "mcpelauncher-linux-bin"]
path = mcpelauncher-linux-bin
url = ../mcpelauncher-linux-bin.git
[submodule "epoll-shim"]
path = epoll-shim
url = ../epoll-shim.git
[submodule "osx-elf-header"]
path = osx-elf-header
url = ../osx-elf-header.git
15 changes: 12 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ else()
set(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
endif(APPLE)

option(BUILD_TESTING "Build tests for cll-telemetry (requires GTest)" OFF)

option(ENABLE_DEV_PATHS "Enables lookup in source directories for misc files required by the launcher. This should be disabled for package builds." ON)
if (ENABLE_DEV_PATHS)
add_definitions(-DDEV_EXTRA_PATHS="${CMAKE_SOURCE_DIR}/mcpelauncher-linux-bin")
Expand All @@ -20,6 +22,11 @@ endif()
include(ext/json.cmake)
include(ext/glfw.cmake)

if (APPLE)
add_subdirectory(osx-elf-header)
add_subdirectory(epoll-shim)
endif()

add_subdirectory(logger)
add_subdirectory(base64)
add_subdirectory(file-util)
Expand All @@ -31,10 +38,12 @@ add_subdirectory(daemon-utils/client)
add_subdirectory(msa-daemon-client)

add_subdirectory(libhybris)
add_subdirectory(eglut)
add_subdirectory(linux-gamepad)
add_subdirectory(game-window)
add_subdirectory(file-picker)
add_subdirectory(game-window)
if (GAMEWINDOW_SYSTEM STREQUAL "EGLUT")
add_subdirectory(eglut)
add_subdirectory(linux-gamepad)
endif()

add_subdirectory(cll-telemetry)

Expand Down
1 change: 1 addition & 0 deletions epoll-shim
Submodule epoll-shim added at d04a26
1 change: 1 addition & 0 deletions osx-elf-header
Submodule osx-elf-header added at 3af774

0 comments on commit dcb1725

Please sign in to comment.