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

Proposal: remove support for sokol #2662

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Proposal: remove support for sokol #2662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@ build/vendor/sdl2/sdl2-config
build/vendor/sdl2/sdl2.pc
build/bin/bin2txt
build/bin/sdl-renderer
build/bin/sokol-renderer
build/bin/tic80
build/bin/tic80-sokol
out/
build/bin/
build/vendor/curl/libcurl.pc
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
url = https://github.com/aliceisjustplaying/sdl-gpu.git
shallow = true
branch = glew-update
[submodule "vendor/sokol"]
path = vendor/sokol
url = https://github.com/floooh/sokol.git
shallow = true
[submodule "vendor/squirrel"]
path = vendor/squirrel
url = https://github.com/albertodemichelis/squirrel.git
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ option(BUILD_STATIC "Static runtime" ${BUILD_STATIC_DEFAULT})
option(BUILD_WITH_ALL "Build all supported scripts" ${BUILD_WITH_ALL_DEFAULT})
option(BUILD_SDL "SDL Enabled" ON)
option(BUILD_SDLGPU "SDL GPU Enabled" OFF)
option(BUILD_SOKOL "Sokol Enabled" OFF)
option(BUILD_LIBRETRO "libretro Enabled" ${BUILD_LIBRETRO_DEFAULT})
option(BUILD_TOOLS "bin2txt prj2cart" OFF)
option(BUILD_EDITORS "Build cart editors" ON)
Expand Down Expand Up @@ -158,7 +157,6 @@ include(cmake/png.cmake)
include(cmake/studio.cmake)

include(cmake/sdl.cmake)
include(cmake/sokol.cmake)
include(cmake/libretro.cmake)
include(cmake/n3ds.cmake)

Expand Down
30 changes: 0 additions & 30 deletions build/macosx/tic80-sokol.plist.in
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions build/macosx/tic80pro-sokol.plist.in
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions cmake/sokol.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/system/libretro/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ git clone https://github.com/nesbox/TIC-80.git
cd TIC-80
git submodule update --init --recursive
cd build
cmake .. -DBUILD_PLAYER=OFF -DBUILD_SOKOL=OFF -DBUILD_SDL=OFF -DBUILD_TOOLS=OFF -DBUILD_LIBRETRO=ON
cmake .. -DBUILD_PLAYER=OFF -DBUILD_SDL=OFF -DBUILD_TOOLS=OFF -DBUILD_LIBRETRO=ON
make
```

Expand Down
137 changes: 0 additions & 137 deletions src/system/sokol/player.c
View file
Open in desktop

This file was deleted.

Loading
Loading