sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-03 11:56:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

emulators/tic-80: update to 1.1.2736

Browse source 
This update brings new support for Janet and replaces some other
dependencies.  QuickJS is currently linked statically from lang/quickjs
as that port does not provide a shared object.

Changelog: https://github.com/nesbox/TIC-80/releases/tag/v1.1.2736
Changelog: https://github.com/nesbox/TIC-80/releases/tag/v1.1.2729
This commit is contained in:
Robert Clausecker 2023-09-08 22:04:21 +02:00
parent 85b92be3a2
commit ad7c8c1ba7
4 changed files with 148 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
emulators/tic-80/Makefile
View file

@ -1,7 +1,6 @@
PORTNAME= TIC-80 PORTNAME= TIC-80
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 1.0.2164 DISTVERSION= 1.1.2736
PORTREVISION= 3
CATEGORIES= emulators games CATEGORIES= emulators games
MAINTAINER= fuz@FreeBSD.org MAINTAINER= fuz@FreeBSD.org
@ -11,16 +10,18 @@ WWW= https://tic80.com
LICENSE= MIT LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
# only available as a static library
# bump TIC-80 when quickjs is updated!
BUILD_DEPENDS= quickjs>0:lang/quickjs
LIB_DEPENDS= libasound.so:audio/alsa-lib \ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libcurl.so:ftp/curl \
libdbus-1.so:devel/dbus \ libdbus-1.so:devel/dbus \
libduktape.so:lang/duktape-lib \
libgif.so:graphics/giflib \ libgif.so:graphics/giflib \
libhttp_parser.so:www/http-parser \
libinotify.so:devel/libinotify \ libinotify.so:devel/libinotify \
libjanet.so:lang/janet \
libpng16.so:graphics/png \ libpng16.so:graphics/png \
libsquirrel.so:lang/squirrel \ libsquirrel.so:lang/squirrel \
libunwind.so:devel/libunwind \ libunwind.so:devel/libunwind
libuv.so:devel/libuv
# for moonscript # for moonscript
RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
@ -34,13 +35,19 @@ GH_TUPLE= nesbox:blip-buf:330226d9b55ecbeea644e17b5e0f096a165ca07e:blip_buf/vend
kuba--:zip:d7df626f3aa457e01669f65e61bf8f484e352941:zip/vendor/zip \ kuba--:zip:d7df626f3aa457e01669f65e61bf8f484e352941:zip/vendor/zip \
nesbox:moonscript:17179283012b392bff972ad66231d73bfeec6e90:moonscript/vendor/moonscript \ nesbox:moonscript:17179283012b392bff972ad66231d73bfeec6e90:moonscript/vendor/moonscript \
cofyc:argparse:0d5f5d0745df14a3f373f7eed85bf524714f4524:argparse/vendor/argparse \ cofyc:argparse:0d5f5d0745df14a3f373f7eed85bf524714f4524:argparse/vendor/argparse \
wasm3:wasm3:a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e:wasm3/vendor/wasm3 wasm3:wasm3:a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e:wasm3/vendor/wasm3 \
blueloveTH:pocketpy:v1.0.0:pocketpy/vendor/pocketpy \
erkkah:naett:v0.3.1:naett/vendor/naett \
notnullnotvoid:msf_gif:v2.2:msfgif/vendor/msf_gif
USE_GL= gl glu glut USE_GL= gl glu glut
USE_SDL= sdl2 USE_SDL= sdl2
CFLAGS+= -I${LOCALBASE}/include/quickjs -pthread
LDFLAGS+= -L${LOCALBASE}/lib/quickjs
LDLIBS+= -lpthread
# unbundled succesfully # unbundled succesfully
# albertodemichelis:squirrel:9dcf74f99097898dd5a111c4a55b89d1c4d606c0:squirrel/vendor/squirrel # albertodemichelis:squirrel:9dcf74f99097898dd5a111c4a55b89d1c4d606c0:squirrel/vendor/squirrel
# svaarala:duktape-releases:28f915a5381ca3a7dfa22130d08fbc5a16ae5d2f:duktape/vendor/duktape
# lua:lua:75ea9ccbea7c4886f30da147fb67b693b2624c26:lua/vendor/lua # lua:lua:75ea9ccbea7c4886f30da147fb67b693b2624c26:lua/vendor/lua
# madler:zlib:cacf7f1d4e3d44d871b605da3b647f07d718623f:zlib/vendor/zlib # madler:zlib:cacf7f1d4e3d44d871b605da3b647f07d718623f:zlib/vendor/zlib
# nesbox:giflib:1aa11b06d0025eda77b56aec8254130654d4397b:giflib/vendor/giflib # nesbox:giflib:1aa11b06d0025eda77b56aec8254130654d4397b:giflib/vendor/giflib
@ -50,9 +57,9 @@ USE_SDL= sdl2
# libsdl-org:SDL:b424665e0899769b200231ba943353a5fee1b6b6:sdl2/vendor/sdl2 # libsdl-org:SDL:b424665e0899769b200231ba943353a5fee1b6b6:sdl2/vendor/sdl2
# grimfang4:sdl-gpu:e3d350b325a0e0d0b3007f69ede62313df46c6ef:sdl_gpu/vendor/sdl-gpu # grimfang4:sdl-gpu:e3d350b325a0e0d0b3007f69ede62313df46c6ef:sdl_gpu/vendor/sdl-gpu
# nesbox:lpeg:73d8614a8dea404cf7bfe25a6e4cea7183dc9fb7:lpeg/vendor/lpeg # nesbox:lpeg:73d8614a8dea404cf7bfe25a6e4cea7183dc9fb7:lpeg/vendor/lpeg
# janet-lang:janet:v1.29.1:janet/vendor/janet
# not actually needed # not actually needed
# smuehlst:circle-stdlib:fdb3c4a948421d47fddab8042a92f980cba43915:circle_stdlib/vendor/circle-stdlib
# floooh:sokol:487822d82ca79dba7b67718d962e1ba6beef01b2:sokol/vendor/sokol # floooh:sokol:487822d82ca79dba7b67718d962e1ba6beef01b2:sokol/vendor/sokol
# mruby:mruby:0f45836b5954accf508f333f932741b925214471:mruby/vendor/mruby # mruby:mruby:0f45836b5954accf508f333f932741b925214471:mruby/vendor/mruby

14
emulators/tic-80/distinfo
View file

@ -1,12 +1,10 @@
TIMESTAMP = 1683662963 TIMESTAMP = 1694199131
SHA256 (nesbox-TIC-80-v1.0.2164_GH0.tar.gz) = 26d0bbb45f190179f37169a7c2a32382844bafaf9b927d63c951bdf2f68f3414 SHA256 (nesbox-TIC-80-v1.1.2736_GH0.tar.gz) = cb9d1670471cad2920684eb8f479395232ea8fc78a1374559fd4b26c4821c999
SIZE (nesbox-TIC-80-v1.0.2164_GH0.tar.gz) = 829743 SIZE (nesbox-TIC-80-v1.1.2736_GH0.tar.gz) = 1810045
SHA256 (nesbox-blip-buf-330226d9b55ecbeea644e17b5e0f096a165ca07e_GH0.tar.gz) = e86870ecb4b7c3feac6afbf5ddd0aff809e14b2d16d9bde251b712fd4ecd6d99 SHA256 (nesbox-blip-buf-330226d9b55ecbeea644e17b5e0f096a165ca07e_GH0.tar.gz) = e86870ecb4b7c3feac6afbf5ddd0aff809e14b2d16d9bde251b712fd4ecd6d99
SIZE (nesbox-blip-buf-330226d9b55ecbeea644e17b5e0f096a165ca07e_GH0.tar.gz) = 51181 SIZE (nesbox-blip-buf-330226d9b55ecbeea644e17b5e0f096a165ca07e_GH0.tar.gz) = 51181
SHA256 (tronkko-dirent-c885633e126a3a949ec0497273ec13e2c03e862c_GH0.tar.gz) = aab1f1d02c3148a3d49a18b8de878603263e62e4a48622121efec92e5b40710b SHA256 (tronkko-dirent-c885633e126a3a949ec0497273ec13e2c03e862c_GH0.tar.gz) = aab1f1d02c3148a3d49a18b8de878603263e62e4a48622121efec92e5b40710b
SIZE (tronkko-dirent-c885633e126a3a949ec0497273ec13e2c03e862c_GH0.tar.gz) = 21182 SIZE (tronkko-dirent-c885633e126a3a949ec0497273ec13e2c03e862c_GH0.tar.gz) = 21182
SHA256 (nesbox-giflib-1aa11b06d0025eda77b56aec8254130654d4397b_GH0.tar.gz) = 0061d8b362e1edce6d47c2cf6df218c3d7d4494bacae98d2f0552b8bb1ebc319
SIZE (nesbox-giflib-1aa11b06d0025eda77b56aec8254130654d4397b_GH0.tar.gz) = 411816
SHA256 (wren-lang-wren-4a18fc489f9ea3d253b20dd40f4cdad0d6bb40eb_GH0.tar.gz) = fb885f12767ea8b1101145b9d86735995e28c5298b712c1c3f71ed9bbf17f567 SHA256 (wren-lang-wren-4a18fc489f9ea3d253b20dd40f4cdad0d6bb40eb_GH0.tar.gz) = fb885f12767ea8b1101145b9d86735995e28c5298b712c1c3f71ed9bbf17f567
SIZE (wren-lang-wren-4a18fc489f9ea3d253b20dd40f4cdad0d6bb40eb_GH0.tar.gz) = 1810731 SIZE (wren-lang-wren-4a18fc489f9ea3d253b20dd40f4cdad0d6bb40eb_GH0.tar.gz) = 1810731
SHA256 (kuba---zip-d7df626f3aa457e01669f65e61bf8f484e352941_GH0.tar.gz) = f121ff9a6df3414afe958c341c0e3f05d638e43e3be735a9dad8d05ce9322c49 SHA256 (kuba---zip-d7df626f3aa457e01669f65e61bf8f484e352941_GH0.tar.gz) = f121ff9a6df3414afe958c341c0e3f05d638e43e3be735a9dad8d05ce9322c49
@ -17,3 +15,9 @@ SHA256 (cofyc-argparse-0d5f5d0745df14a3f373f7eed85bf524714f4524_GH0.tar.gz) = b1
SIZE (cofyc-argparse-0d5f5d0745df14a3f373f7eed85bf524714f4524_GH0.tar.gz) = 10152 SIZE (cofyc-argparse-0d5f5d0745df14a3f373f7eed85bf524714f4524_GH0.tar.gz) = 10152
SHA256 (wasm3-wasm3-a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e_GH0.tar.gz) = 6a6d988a60f37caa24b997a6510229c4e89fce07aa666413da6ed9814ac0463f SHA256 (wasm3-wasm3-a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e_GH0.tar.gz) = 6a6d988a60f37caa24b997a6510229c4e89fce07aa666413da6ed9814ac0463f
SIZE (wasm3-wasm3-a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e_GH0.tar.gz) = 2575346 SIZE (wasm3-wasm3-a3abb3f2d320994be59dfbe2cdafa8d0b6a8253e_GH0.tar.gz) = 2575346
SHA256 (blueloveTH-pocketpy-v1.0.0_GH0.tar.gz) = 01b0d299b31f94056b66b1e140aad2ef9b75a14a7105bacd14283ea61b27e161
SIZE (blueloveTH-pocketpy-v1.0.0_GH0.tar.gz) = 793267
SHA256 (erkkah-naett-v0.3.1_GH0.tar.gz) = 572ceeb0a6cb86e809bb2c7e971b2a4d257b69f981507c4deaf65aadf22ff15b
SIZE (erkkah-naett-v0.3.1_GH0.tar.gz) = 87948
SHA256 (notnullnotvoid-msf_gif-v2.2_GH0.tar.gz) = 96863cb0bf798af745e29cd258f1d004cdfcc47ef9991c04b4005e30b89f5ed4
SIZE (notnullnotvoid-msf_gif-v2.2_GH0.tar.gz) = 362849165

176
emulators/tic-80/files/patch-CMakeLists.txt
View file

@ -1,4 +1,4 @@
--- CMakeLists.txt.orig 2022-05-02 07:31:14 UTC --- CMakeLists.txt.orig 2023-08-27 09:42:28 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -14,7 +14,6 @@ if(CMAKE_BUILD_TYPE) @@ -14,7 +14,6 @@ if(CMAKE_BUILD_TYPE)
string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE_UC) string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE_UC)
@ -8,7 +8,7 @@
if(Git_FOUND) if(Git_FOUND)
execute_process( execute_process(
COMMAND ${GIT_EXECUTABLE} status COMMAND ${GIT_EXECUTABLE} status
@@ -155,72 +154,18 @@ set(THIRDPARTY_DIR ${CMAKE_SOURCE_DIR}/vendor) @@ -160,72 +159,18 @@ set(THIRDPARTY_DIR ${CMAKE_SOURCE_DIR}/vendor)
include(ExternalProject) include(ExternalProject)
@ -83,11 +83,9 @@
# WREN # WREN
################################ ################################
@@ -335,59 +280,11 @@ target_include_directories(wasm PUBLIC ${THIRDPARTY_DI @@ -362,41 +307,6 @@ if (BAREMETALPI)
#target_include_directories(wasm PRIVATE ${THIRDPARTY_DIR}/wasm3/src/optional) endif()
#target_include_directories(wasm PRIVATE ${THIRDPARTY_DIR}/wasm3/src/vm)
-
################################ ################################
-# SQUIRREL -# SQUIRREL
-################################ -################################
@ -114,6 +112,7 @@
- ${SQUIRREL_DIR}/sqstdlib/sqstdstream.cpp - ${SQUIRREL_DIR}/sqstdlib/sqstdstream.cpp
- ${SQUIRREL_DIR}/sqstdlib/sqstdstring.cpp - ${SQUIRREL_DIR}/sqstdlib/sqstdstring.cpp
- ${SQUIRREL_DIR}/sqstdlib/sqstdsystem.cpp - ${SQUIRREL_DIR}/sqstdlib/sqstdsystem.cpp
-
-) -)
- -
-add_library(squirrel STATIC ${SQUIRREL_SRC}) -add_library(squirrel STATIC ${SQUIRREL_SRC})
@ -123,9 +122,18 @@
-target_include_directories(squirrel PRIVATE ${SQUIRREL_DIR}/sqstdlib) -target_include_directories(squirrel PRIVATE ${SQUIRREL_DIR}/sqstdlib)
- -
-################################ -################################
# GIFLIB # PocketPy (Python)
################################ ################################
@@ -432,27 +342,8 @@ else()
target_compile_features(python PRIVATE cxx_std_17)
endif()
-################################
-# GIFLIB
-################################
+find_package(GIF REQUIRED)
-set(GIFLIB_DIR ${THIRDPARTY_DIR}/giflib) -set(GIFLIB_DIR ${THIRDPARTY_DIR}/giflib)
-set(GIFLIB_SRC -set(GIFLIB_SRC
- ${GIFLIB_DIR}/dgif_lib.c - ${GIFLIB_DIR}/dgif_lib.c
@ -139,50 +147,92 @@
-add_library(giflib STATIC ${GIFLIB_SRC}) -add_library(giflib STATIC ${GIFLIB_SRC})
-target_include_directories(giflib -target_include_directories(giflib
- PRIVATE ${GIFLIB_DIR} - PRIVATE ${GIFLIB_DIR}
- INTERFACE ${THIRDPARTY_DIR}/giflib) - INTERFACE
+find_package(GIF REQUIRED) - ${THIRDPARTY_DIR}/giflib
- ${THIRDPARTY_DIR}/msf_gif)
-
################################ ################################
# Blipbuf # Blipbuf
@@ -397,13 +294,6 @@ add_library(blipbuf STATIC ${THIRDPARTY_DIR}/blip-buf/ ################################
@@ -461,36 +352,6 @@ add_library(blipbuf STATIC ${THIRDPARTY_DIR}/blip-buf/
target_include_directories(blipbuf INTERFACE ${THIRDPARTY_DIR}/blip-buf) target_include_directories(blipbuf INTERFACE ${THIRDPARTY_DIR}/blip-buf)
################################ ################################
-# Duktape -# QuickJS
-################################ -################################
- -
-add_library(duktape STATIC ${THIRDPARTY_DIR}/duktape/src/duktape.c) -set(QUICKJS_DIR ${THIRDPARTY_DIR}/quickjs)
-target_include_directories(duktape INTERFACE ${THIRDPARTY_DIR}/duktape/src) -
-file(STRINGS ${QUICKJS_DIR}/VERSION CONFIG_VERSION)
-
-add_library(quickjs STATIC
- ${QUICKJS_DIR}/quickjs.c
- ${QUICKJS_DIR}/libregexp.c
- ${QUICKJS_DIR}/libunicode.c
- ${QUICKJS_DIR}/cutils.c)
-
-target_compile_definitions(quickjs PUBLIC CONFIG_VERSION="${CONFIG_VERSION}")
-target_include_directories(quickjs INTERFACE ${QUICKJS_DIR})
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
- target_compile_definitions(quickjs PRIVATE DUMP_LEAKS)
-endif()
-
-if(BAREMETALPI OR N3DS)
- target_compile_definitions(quickjs PRIVATE POOR_CLIB)
-endif()
-
-if(LINUX)
- target_compile_definitions(quickjs PUBLIC _GNU_SOURCE _POSIX_C_SOURCE=200112)
- target_link_libraries(quickjs PUBLIC m dl pthread)
-endif()
- -
-################################ -################################
# TIC-80 core # Janet
################################ ################################
@@ -440,19 +330,20 @@ macro(MACRO_CORE SCRIPT DEFINE BUILD_DEPRECATED) @@ -529,9 +390,7 @@ if(BUILD_WITH_JANET)
)
endif()
- add_library(janet ${THIRDPARTY_DIR}/janet/build/c/janet.c)
- target_include_directories(janet PUBLIC ${THIRDPARTY_DIR}/janet/src/include)
- target_include_directories(janet PUBLIC ${CMAKE_SOURCE_DIR}/build/janet/)
+ pkg_check_modules(JANET REQUIRED janet)
endif()
################################
@@ -578,24 +437,26 @@ macro(MACRO_CORE SCRIPT DEFINE BUILD_DEPRECATED)
target_include_directories(tic80core${SCRIPT}
PRIVATE PRIVATE
+ ${THIRDPARTY_DIR}/msf_gif
${THIRDPARTY_DIR}/moonscript ${THIRDPARTY_DIR}/moonscript
${THIRDPARTY_DIR}/fennel ${THIRDPARTY_DIR}/fennel
${POCKETPY_DIR}/src
+ ${LUA_INCLUDE_DIRS} + ${LUA_INCLUDE_DIRS}
PUBLIC PUBLIC
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/src) ${CMAKE_SOURCE_DIR}/src)
target_link_libraries(tic80core${SCRIPT} target_link_libraries(tic80core${SCRIPT}
- lua - lua
- lpeg - lpeg
+ ${LUA_LIBRARIES} + ${LUA_LIBRARIES}
wren wren
wasm wasm
+ sqstdlib squirrel
squirrel + sqstdlib
duktape python
blipbuf scheme
quickjs
blipbuf
- zlib - zlib
+ z + z
) )
if(BUILD_WITH_MRUBY) if(BUILD_WITH_MRUBY)
@@ -461,7 +352,7 @@ macro(MACRO_CORE SCRIPT DEFINE BUILD_DEPRECATED) @@ -608,7 +469,7 @@ macro(MACRO_CORE SCRIPT DEFINE BUILD_DEPRECATED)
if(${BUILD_DEPRECATED}) if(${BUILD_DEPRECATED})
target_compile_definitions(tic80core${SCRIPT} PRIVATE BUILD_DEPRECATED) target_compile_definitions(tic80core${SCRIPT} PRIVATE BUILD_DEPRECATED)
@ -191,7 +241,7 @@
endif() endif()
if(LINUX) if(LINUX)
@@ -498,6 +389,8 @@ endif() @@ -656,6 +517,8 @@ endif()
################################ ################################
if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI) if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI)
@ -200,7 +250,7 @@
if(WIN32) if(WIN32)
set(HAVE_LIBC TRUE) set(HAVE_LIBC TRUE)
endif() endif()
@@ -507,10 +400,6 @@ if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI) @@ -665,10 +528,6 @@ if(BUILD_SDL AND NOT EMSCRIPTEN AND NOT RPI)
set(SDL_STATIC_PIC ON CACHE BOOL "" FORCE) set(SDL_STATIC_PIC ON CACHE BOOL "" FORCE)
endif() endif()
@ -211,7 +261,7 @@
endif() endif()
################################ ################################
@@ -531,7 +420,7 @@ if(BUILD_SDL AND BUILD_PLAYER AND NOT RPI) @@ -694,7 +553,7 @@ if(BUILD_SDL AND BUILD_PLAYER AND NOT RPI)
target_link_options(player-sdl PRIVATE -static) target_link_options(player-sdl PRIVATE -static)
endif() endif()
@ -220,7 +270,7 @@
endif() endif()
################################ ################################
@@ -657,34 +546,8 @@ endif() @@ -835,34 +694,8 @@ endif()
# ZLIB # ZLIB
################################ ################################
@ -256,7 +306,7 @@
################################ ################################
# ZIP # ZIP
################################ ################################
@@ -693,6 +556,12 @@ set(CMAKE_DISABLE_TESTING ON CACHE BOOL "" FORCE) @@ -871,6 +704,12 @@ set(CMAKE_DISABLE_TESTING ON CACHE BOOL "" FORCE)
add_subdirectory(${THIRDPARTY_DIR}/zip) add_subdirectory(${THIRDPARTY_DIR}/zip)
################################ ################################
@ -269,7 +319,7 @@
# bin2txt cart2prj prj2cart xplode wasmp2cart # bin2txt cart2prj prj2cart xplode wasmp2cart
################################ ################################
@@ -713,7 +582,7 @@ if(BUILD_DEMO_CARTS) @@ -891,7 +730,7 @@ if(BUILD_DEMO_CARTS)
target_link_libraries(wasmp2cart tic80core) target_link_libraries(wasmp2cart tic80core)
add_executable(bin2txt ${TOOLS_DIR}/bin2txt.c) add_executable(bin2txt ${TOOLS_DIR}/bin2txt.c)
@ -278,34 +328,19 @@
add_executable(xplode add_executable(xplode
${TOOLS_DIR}/xplode.c ${TOOLS_DIR}/xplode.c
@@ -722,7 +591,7 @@ if(BUILD_DEMO_CARTS) @@ -997,7 +836,7 @@ if(USE_NAETT)
${CMAKE_SOURCE_DIR}/src/studio/project.c)
target_include_directories(xplode PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/include) if(WIN32)
- target_link_libraries(xplode tic80core png giflib) target_link_libraries(naett INTERFACE winhttp)
+ target_link_libraries(xplode tic80core PNG::PNG ${GIF_LIBRARIES}) - elseif(LINUX)
+ elseif(LINUX OR FREEBSD)
if(LINUX) find_package(CURL REQUIRED)
target_link_libraries(xplode m) target_include_directories(naett PRIVATE ${CURL_INCLUDE_DIRS})
@@ -803,54 +672,9 @@ target_include_directories(argparse INTERFACE ${THIRDP target_link_libraries(naett ${CURL_LIBRARIES})
# libuv @@ -1005,40 +844,6 @@ if(USE_NAETT)
################################ endif()
-if(USE_LIBUV)
- add_subdirectory(${THIRDPARTY_DIR}/libuv)
-endif()
+pkg_check_modules(LIBUV REQUIRED libuv)
################################ ################################
-# HTTP parser
-################################
-
-if(USE_LIBUV)
- add_library(http_parser STATIC ${THIRDPARTY_DIR}/http-parser/http_parser.c)
- target_include_directories(http_parser INTERFACE ${THIRDPARTY_DIR}/http-parser)
-endif()
-
-################################
-# PNG -# PNG
-################################ -################################
- -
@ -343,24 +378,19 @@
# TIC-80 studio # TIC-80 studio
################################ ################################
@@ -894,13 +718,13 @@ if(WIN32) @@ -1082,9 +887,9 @@ if(WIN32)
target_include_directories(tic80studio PRIVATE ${THIRDPARTY_DIR}/dirent/include) target_include_directories(tic80studio PRIVATE ${THIRDPARTY_DIR}/dirent/include)
endif() endif()
-target_include_directories(tic80studio PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) -target_include_directories(tic80studio PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+target_include_directories(tic80studio PUBLIC ${CMAKE_CURRENT_BINARY_DIR} PRIVATE ${LUA_INCLUDE_DIRS}) +target_include_directories(tic80studio PUBLIC ${CMAKE_CURRENT_BINARY_DIR} PRIVATE ${LUA_INCLUDE_DIRS} ${THIRDPARTY_DIR}/msf_gif)
-target_link_libraries(tic80studio tic80core zip wave_writer argparse giflib png) -target_link_libraries(tic80studio tic80core zip wave_writer argparse giflib png)
+target_link_libraries(tic80studio tic80core zip wave_writer argparse ${GIF_LIBRARIES} PNG::PNG) +target_link_libraries(tic80studio tic80core zip wave_writer argparse ${GIF_LIBRARIES} png)
if(USE_LIBUV) if(USE_NAETT)
target_compile_definitions(tic80studio PRIVATE USE_LIBUV) target_compile_definitions(tic80studio PRIVATE USE_NAETT)
- target_link_libraries(tic80studio uv_a http_parser) @@ -1102,80 +907,6 @@ endif()
+ target_link_libraries(tic80studio ${LIBUV_LIBRARIES} http_parser)
endif()
if(BUILD_PRO)
@@ -914,80 +738,6 @@ endif()
target_compile_definitions(tic80studio PUBLIC BUILD_EDITORS) target_compile_definitions(tic80studio PUBLIC BUILD_EDITORS)
################################ ################################
@ -441,7 +471,7 @@
# TIC-80 app # TIC-80 app
################################ ################################
@@ -1028,7 +778,7 @@ if(BUILD_SDL) @@ -1216,7 +947,7 @@ if(BUILD_SDL)
endif() endif()
elseif(NOT ANDROID) elseif(NOT ANDROID)
@ -450,7 +480,7 @@
endif() endif()
target_link_libraries(tic80 tic80studio) target_link_libraries(tic80 tic80studio)
@@ -1044,13 +794,13 @@ if(BUILD_SDL) @@ -1237,13 +968,13 @@ if(BUILD_SDL)
endif() endif()
if(BUILD_SDLGPU) if(BUILD_SDLGPU)
@ -466,7 +496,7 @@
endif() endif()
endif() endif()
@@ -1121,7 +871,7 @@ if(N3DS) @@ -1314,7 +1045,7 @@ if(N3DS)
${CMAKE_SOURCE_DIR}/src) ${CMAKE_SOURCE_DIR}/src)
target_link_directories(tic80_n3ds PRIVATE ${DEVKITPRO}/libctru/lib ${DEVKITPRO}/portlibs/3ds/lib) target_link_directories(tic80_n3ds PRIVATE ${DEVKITPRO}/libctru/lib ${DEVKITPRO}/portlibs/3ds/lib)
@ -475,7 +505,7 @@
add_custom_command(TARGET tic80_n3ds add_custom_command(TARGET tic80_n3ds
POST_BUILD POST_BUILD
@@ -1181,7 +931,7 @@ if(BUILD_STUB) @@ -1374,7 +1105,7 @@ if(BUILD_STUB)
endif() endif()
else() else()
@ -484,7 +514,7 @@
endif() endif()
target_link_libraries(tic80${SCRIPT} tic80core${SCRIPT} argparse) target_link_libraries(tic80${SCRIPT} tic80core${SCRIPT} argparse)
@@ -1193,13 +943,13 @@ if(BUILD_STUB) @@ -1386,13 +1117,13 @@ if(BUILD_STUB)
endif() endif()
if(BUILD_SDLGPU) if(BUILD_SDLGPU)

20
emulators/tic-80/files/patch-vendor_naett_naett.c Normal file
View file

@ -0,0 +1,20 @@
--- vendor/naett/naett.c.orig 2023-09-08 19:55:43 UTC
+++ vendor/naett/naett.c
@@ -22,7 +22,7 @@
#define __WINDOWS__ 1
#endif
-#if __linux__ && !__ANDROID__
+#if __linux__ && !__ANDROID__ || __FreeBSD__
#define __LINUX__ 1
#include <curl/curl.h>
#endif
@@ -782,7 +782,7 @@ void naettPlatformCloseResponse(InternalResponse* res)
// Inlined naett_linux.c: //
//#include "naett_internal.h"
-#if __linux__ && !__ANDROID__
+#if __linux__ && !__ANDROID__ || __FreeBSD__
#include <curl/curl.h>
#include <assert.h>