This commit is contained in:
proller committed 2024-11-14 01:46:26 +01:00
1 parent 2d58e1fa00
commit 6d6b47be45
3 files changed
+8 -7

No files matched your search

-1
View File
@@ -125,7 +125,6 @@ jobs:
run: cmake --build . --config Release
- name: Unittests
continue-on-error: true
# need this workaround for stdout to work
run: |
$proc = start .\bin\Release\freeminer.exe --run-unittests -NoNewWindow -Wait -PassThru
+7 -5
View File
@@ -263,11 +263,12 @@ local function set_selected_server(tabdata, idx, server)
if address and port then
core.settings:set("address", address)
core.settings:set("remote_port", port)
if server.proto_multi and server.proto_multi.enet then
-- FMTODO: fix enet and others and remove "false and"
if false and server.proto_multi and server.proto_multi.enet then
gamedata.proto = "enet"
core.settings:set("remote_port", server.proto_multi.enet)
elseif server.proto_multi and server.proto_multi.sctp then
elseif false and server.proto_multi and server.proto_multi.sctp then
gamedata.proto = "sctp"
core.settings:set("remote_port", server.proto_multi.sctp)
elseif server.proto then
@@ -311,10 +312,11 @@ local function main_button_handler(tabview, fields, name, tabdata)
gamedata.serverdescription = server.description
gamedata.proto_multi = server.proto_multi
if gamedata.address and gamedata.port then
if gamedata.proto_multi and gamedata.proto_multi.enet then
-- FMTODO: fix enet and others and remove "false and"
if false and gamedata.proto_multi and gamedata.proto_multi.enet then
gamedata.port = gamedata.proto_multi.enet
gamedata.proto = "enet"
elseif gamedata.proto_multi and gamedata.proto_multi.sctp then
elseif false and gamedata.proto_multi and gamedata.proto_multi.sctp then
gamedata.port = gamedata.proto_multi.sctp
gamedata.proto = "sctp"
end
+1 -1
View File
@@ -13,7 +13,7 @@ cmake .. \
-DZSTD_LIBRARY=/opt/homebrew/lib/libzstd.a \
-DGMP_LIBRARY=/opt/homebrew/lib/libgmp.a \
-DENABLE_SYSTEM_JSONCPP=OFF \
-D_NO_ENABLE_LEVELDB=OFF \
-ENABLE_LEVELDB=OFF \
-DENABLE_POSTGRESQL=OFF \
-DENABLE_REDIS=OFF \
-DJPEG_LIBRARY=/opt/homebrew/lib/libjpeg.a \