Skip to content

Commit

Permalink
update cmake config
Browse files Browse the repository at this point in the history
  • Loading branch information
julesgrc0 committed Feb 29, 2024
1 parent 02df7c2 commit f5abef6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
18 changes: 7 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,13 @@ endif()
option(W_BUILD_MINSIZE "Build a smaller executable (Wispy)" OFF)
option(W_BUILD_ASSETS "Build assets (Wispy)" ON)

# add dependencies
add_subdirectory(libs/raylib)
add_subdirectory(libs/zlib)
add_subdirectory(libs/json-c)

# add include directories
include_directories(
${CMAKE_SOURCE_DIR}/libs/raylib/src
${CMAKE_SOURCE_DIR}/libs/zlib
${CMAKE_SOURCE_DIR}/libs/json-c
)
# add dependencies and include directories
file(GLOB SUBDIRS "libs/*")
foreach(DIR ${SUBDIRS})
if(IS_DIRECTORY ${DIR})
add_subdirectory(${DIR})
endif()
endforeach()

# pack assets to resource.pack
if(W_BUILD_ASSETS)
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# 🎮 Wispy

![C](https://img.shields.io/github/languages/top/julesgrc0/wispy?label=C%20🔥) ![Platform](https://img.shields.io/badge/Platform%20🌍-Windows%20|%20Linux%20|%20Android-purple) ![Game](https://img.shields.io/badge/Game%20🎮-Wispy-green) ![Version](https://shields.io/github/v/release/julesgrc0/wispy?label=Version%20🧮&color=lightblue) [![Release Build](https://github.com/julesgrc0/wispy/actions/workflows/windows.yml/badge.svg)](https://github.com/julesgrc0/wispy/actions/workflows/windows.yml) [![Release Build](https://github.com/julesgrc0/wispy/actions/workflows/linux.yml/badge.svg)](https://github.com/julesgrc0/wispy/actions/workflows/linux.yml) [![Release Build](https://github.com/julesgrc0/wispy/actions/workflows/android.yml/badge.svg)](https://github.com/julesgrc0/wispy/actions/workflows/android.yml)
![C](https://img.shields.io/github/languages/top/julesgrc0/wispy?label=C%20🔥) ![Platform](https://img.shields.io/badge/Platform%20🌍-Windows%20|%20Linux%20|%20Android-purple) ![Game](https://img.shields.io/badge/Game%20🎮-Wispy-green) ![Version](https://shields.io/github/v/release/julesgrc0/wispy?label=Version%20🧮&color=lightblue) [![Downloads](https://img.shields.io/github/downloads/julesgrc0/wispy/total.svg?label=Downloads%20📊)](https://github.com/julesgrc0/wispy/releases/latest)
[![Release Build](https://github.com/julesgrc0/wispy/actions/workflows/windows.yml/badge.svg)](https://github.com/julesgrc0/wispy/actions/workflows/windows.yml) [![Release Build](https://github.com/julesgrc0/wispy/actions/workflows/linux.yml/badge.svg)](https://github.com/julesgrc0/wispy/actions/workflows/linux.yml) [![Release Build](https://github.com/julesgrc0/wispy/actions/workflows/android.yml/badge.svg)](https://github.com/julesgrc0/wispy/actions/workflows/android.yml)

**Concept**: Wipsy is a kind of 2D Minecraft.

Expand Down
2 changes: 1 addition & 1 deletion libs/raylib
Submodule raylib updated 99 files
+1 −1 cmake/GlfwImport.cmake
+1 −0 examples/Makefile
+4 −0 examples/Makefile.Web
+1 −0 examples/README.md
+176 −0 examples/core/core_random_sequence.c
+ examples/core/core_random_sequence.png
+177 −105 examples/models/models_loading_vox.c
+ examples/models/resources/models/vox/fez.vox
+76 −0 examples/models/resources/shaders/glsl330/voxel_lighting.fs
+32 −0 examples/models/resources/shaders/glsl330/voxel_lighting.vs
+170 −0 examples/models/rlights.h
+15 −0 parser/output/raylib_api.json
+9 −0 parser/output/raylib_api.lua
+209 −203 parser/output/raylib_api.txt
+5 −1 parser/output/raylib_api.xml
+387 −0 projects/VS2022/examples/core_random_sequence.vcxproj
+2 −0 projects/VS2022/raylib.sln
+11 −10 src/Makefile
+1 −1 src/external/glfw/CMake/glfw3.pc.in
+9 −23 src/external/glfw/CMakeLists.txt
+35 −0 src/external/glfw/CONTRIBUTORS.md
+77 −39 src/external/glfw/README.md
+0 −247 src/external/glfw/deps/vs2008/stdint.h
+102 −0 src/external/glfw/deps/wayland/fractional-scale-v1.xml
+83 −0 src/external/glfw/deps/wayland/idle-inhibit-unstable-v1.xml
+339 −0 src/external/glfw/deps/wayland/pointer-constraints-unstable-v1.xml
+136 −0 src/external/glfw/deps/wayland/relative-pointer-unstable-v1.xml
+180 −0 src/external/glfw/deps/wayland/viewporter.xml
+3,151 −0 src/external/glfw/deps/wayland/wayland.xml
+200 −0 src/external/glfw/deps/wayland/xdg-activation-v1.xml
+156 −0 src/external/glfw/deps/wayland/xdg-decoration-unstable-v1.xml
+1,370 −0 src/external/glfw/deps/wayland/xdg-shell.xml
+236 −112 src/external/glfw/include/GLFW/glfw3.h
+63 −34 src/external/glfw/include/GLFW/glfw3native.h
+31 −63 src/external/glfw/src/CMakeLists.txt
+77 −74 src/external/glfw/src/cocoa_init.m
+0 −2 src/external/glfw/src/cocoa_joystick.h
+12 −5 src/external/glfw/src/cocoa_joystick.m
+19 −3 src/external/glfw/src/cocoa_monitor.m
+2 −2 src/external/glfw/src/cocoa_platform.h
+4 −2 src/external/glfw/src/cocoa_time.c
+36 −13 src/external/glfw/src/cocoa_window.m
+2 −2 src/external/glfw/src/context.c
+67 −40 src/external/glfw/src/egl_context.c
+5 −2 src/external/glfw/src/glx_context.c
+16 −33 src/external/glfw/src/init.c
+13 −8 src/external/glfw/src/input.c
+27 −34 src/external/glfw/src/internal.h
+10 −5 src/external/glfw/src/linux_joystick.c
+1 −2 src/external/glfw/src/linux_joystick.h
+553 −1,118 src/external/glfw/src/mappings.h
+6 −6 src/external/glfw/src/mappings.h.in
+4 −4 src/external/glfw/src/monitor.c
+17 −9 src/external/glfw/src/nsgl_context.m
+205 −74 src/external/glfw/src/null_init.c
+0 −2 src/external/glfw/src/null_joystick.c
+3 −4 src/external/glfw/src/null_monitor.c
+125 −3 src/external/glfw/src/null_platform.h
+68 −69 src/external/glfw/src/null_window.c
+2 −5 src/external/glfw/src/osmesa_context.c
+30 −7 src/external/glfw/src/platform.c
+52 −3 src/external/glfw/src/platform.h
+4 −2 src/external/glfw/src/posix_module.c
+4 −2 src/external/glfw/src/posix_poll.c
+0 −2 src/external/glfw/src/posix_poll.h
+4 −2 src/external/glfw/src/posix_thread.c
+4 −2 src/external/glfw/src/posix_time.c
+0 −2 src/external/glfw/src/vulkan.c
+22 −2 src/external/glfw/src/wgl_context.c
+80 −76 src/external/glfw/src/win32_init.c
+11 −2 src/external/glfw/src/win32_joystick.c
+0 −2 src/external/glfw/src/win32_joystick.h
+4 −2 src/external/glfw/src/win32_module.c
+26 −4 src/external/glfw/src/win32_monitor.c
+4 −1 src/external/glfw/src/win32_platform.h
+4 −2 src/external/glfw/src/win32_thread.c
+5 −0 src/external/glfw/src/win32_thread.h
+3 −2 src/external/glfw/src/win32_time.c
+5 −0 src/external/glfw/src/win32_time.h
+154 −73 src/external/glfw/src/win32_window.c
+26 −9 src/external/glfw/src/window.c
+311 −101 src/external/glfw/src/wl_init.c
+18 −16 src/external/glfw/src/wl_monitor.c
+195 −25 src/external/glfw/src/wl_platform.h
+876 −457 src/external/glfw/src/wl_window.c
+82 −80 src/external/glfw/src/x11_init.c
+31 −6 src/external/glfw/src/x11_monitor.c
+1 −1 src/external/glfw/src/x11_platform.h
+23 −17 src/external/glfw/src/x11_window.c
+3 −2 src/external/glfw/src/xkb_unicode.c
+17 −0 src/external/vox_loader.h
+11 −1 src/platforms/rcore_desktop.c
+25 −26 src/platforms/rcore_desktop_sdl.c
+1 −0 src/raylib.h
+11 −2 src/rglfw.c
+26 −19 src/rmodels.c
+7 −7 src/rshapes.c
+11 −11 src/rtext.c
+19 −8 src/rtextures.c

0 comments on commit f5abef6

Please sign in to comment.