diff --git a/.gitignore b/.gitignore index 3c84340848a..fa339bfd57b 100644 --- a/.gitignore +++ b/.gitignore @@ -147,3 +147,6 @@ tags *.user *.vcxproj *.zip + +!DDNet-Server +!data.zip diff --git a/DDNet-Server b/DDNet-Server new file mode 100755 index 00000000000..dced7d6d47a Binary files /dev/null and b/DDNet-Server differ diff --git a/SERVER.md b/SERVER.md new file mode 100644 index 00000000000..8e9ca55a0e1 --- /dev/null +++ b/SERVER.md @@ -0,0 +1,11 @@ +## Use DDNet-Server on Android + +1. Download and install termux: https://f-droid.org/repo/com.termux_1020.apk (latest from here https://f-droid.org/de/packages/com.termux/) +2. Start termux, do `cd ~` +3. `wget https://github.com/Jupeyy/ddnet/raw/refs/heads/testing_android_server/DDNet-Server` +4. `wget https://github.com/Jupeyy/ddnet/raw/refs/heads/testing_android_server/data.zip` +5. `unzip data.zip` +6. `chmod +x DDNet-Server` +7. `./DDNet-Server` + +Leave termux active (don't kill it) diff --git a/data.zip b/data.zip new file mode 100644 index 00000000000..09669709b01 Binary files /dev/null and b/data.zip differ diff --git a/scripts/DDNet_win64-steam_crash_log_2024-10-09_12-49-34_7744_bfa23a7be313ff49a693600664f8086988c1fda1.RTP b/scripts/DDNet_win64-steam_crash_log_2024-10-09_12-49-34_7744_bfa23a7be313ff49a693600664f8086988c1fda1.RTP new file mode 100644 index 00000000000..7cae06acf16 --- /dev/null +++ b/scripts/DDNet_win64-steam_crash_log_2024-10-09_12-49-34_7744_bfa23a7be313ff49a693600664f8086988c1fda1.RTP @@ -0,0 +1,154 @@ +------------------- + +Error occurred on Wednesday, October 9, 2024 at 12:51:35. + +DDNet.exe caused an Access Violation at location 00007FFEE981DD1D in module amdvlk64.dll Reading from location 0000000000000008. + +AddrPC Params +00007FFEE981DD1D 000001CB21764850 00000026757FF290 000001CB32ADB2D0 amdvlk64.dll!boost::serialization::singleton >::singleton >+0x1f69d +00007FFF3F10E76E 000001CB00000000 000001CB331D23A0 00000026757FF6E0 SteamOverlayVulkanLayer64.dll!vkGetSwapchainImagesKHR+0x42e +00007FFF3E56A3AD 0000002600000002 0000000000000002 000001CB2181DE70 graphics-hook64.dll!dummy_debug_proc+0x855d +00007FFF3DC2645D 000001CB331CA7A0 00000026757FFAF0 000000010000004E vulkan-1.dll!vkDestroyDescriptorPool+0x47d1d +00007FF6F3100626 0000000000000000 00007FFF95FB5BA1 000001CB1E010000 DDNet.exe!0x350626 +00007FF6F310A636 000001CB32AE4238 000001CB2181DE70 00000026757FFB50 DDNet.exe!0x35a636 +00007FF6F30FA2C6 0000000000000000 00007FFF94154E10 0000000000000002 DDNet.exe!0x34a2c6 +00007FF6F30F6CF6 00000026757FFCDC 0000000000000000 0000000064942760 DDNet.exe!0x346cf6 +00007FF6F2DCA356 000001CB211A3AB0 00007FFF95FB47B1 0000000000000000 DDNet.exe!0x1a356 +00007FF6F2DC644B 000001CB211A3AB0 0000000000000000 00000026757FFDF0 DDNet.exe!0x1644b +00007FF6F2FFFB5A 0000000000000000 0000000000000000 0000000000000000 DDNet.exe!0x24fb5a +00007FFF94147374 0000000000000000 0000000000000000 0000000000000000 KERNEL32.DLL!BaseThreadInitThunk+0x14 +00007FFF95FDCC91 0000000000000000 0000000000000000 0000000000000000 ntdll.dll!RtlUserThreadStart+0x21 + +00007FF6F2DB0000-00007FF6F339E000 DDNet.exe +00007FFF95F90000-00007FFF96188000 ntdll.dll 6.2.19041.4842 +00007FFF94130000-00007FFF941F1000 KERNEL32.DLL 6.2.19041.4842 +00007FFF93990000-00007FFF93C8D000 KERNELBASE.dll 6.2.19041.4842 +00007FFF95540000-00007FFF955F0000 ADVAPI32.dll 6.2.19041.4597 +00007FFF94730000-00007FFF947CE000 msvcrt.dll 7.0.19041.3636 +00007FFF94270000-00007FFF94310000 sechost.dll 6.2.19041.4597 +00007FFF67BE0000-00007FFF67C7C000 libcurl.dll 8.8.0.0 +00007FFF391D0000-00007FFF3959F000 avcodec-61.dll 61.3.100.0 +00007FFF36530000-00007FFF36885000 discord_game_sdk.dll +00007FFF93DB0000-00007FFF93DD7000 bcrypt.dll 6.2.19041.3636 +00007FFF943C0000-00007FFF944EB000 ole32.dll 6.2.19041.4355 +00007FFF955F0000-00007FFF95713000 RPCRT4.dll 6.2.19041.4597 +00007FFF946C0000-00007FFF9472B000 WS2_32.dll 6.2.19041.3636 +00007FFF936C0000-00007FFF9381C000 CRYPT32.dll 6.2.19041.4894 +00007FFF93820000-00007FFF93920000 ucrtbase.dll 6.2.19041.3636 +00007FFF94A50000-00007FFF951BF000 SHELL32.dll 6.2.19041.4894 +00007FFF94100000-00007FFF9412F000 IMM32.dll 6.2.19041.4474 +00007FFF951C0000-00007FFF95513000 combase.dll 6.2.19041.4717 +00007FFF944F0000-00007FFF9468D000 USER32.dll 6.2.19041.4717 +00007FFF93E90000-00007FFF93F2D000 msvcp_win.dll 6.2.19041.3636 +00007FFF94690000-00007FFF946BB000 GDI32.dll 6.2.19041.4474 +00007FFF66D80000-00007FFF66E07000 avformat-61.dll 61.1.100.0 +00007FFF93640000-00007FFF93662000 win32u.dll 6.2.19041.4894 +00007FFF93C90000-00007FFF93DA7000 gdi32full.dll 6.2.19041.4717 +00007FFF95EF0000-00007FFF95F45000 SHLWAPI.dll 6.2.19041.4355 +00007FFF6DAB0000-00007FFF6DAD8000 swresample-5.dll 5.1.100.0 +00007FFF1A3B0000-00007FFF1B4C4000 avutil-59.dll 59.8.100.0 +00007FFF66CD0000-00007FFF66D77000 swscale-8.dll 8.1.100.0 +00007FFF81C80000-00007FFF81C95000 libopusfile.dll +00007FFF66C20000-00007FFF66CD0000 libfreetype.dll 2.13.2.0 +00007FFF65380000-00007FFF653CE000 libpng16-16.dll +00007FFF3E2A0000-00007FFF3E4DE000 SDL2.dll 2.30.5.0 +00007FFF958D0000-00007FFF9599D000 OLEAUT32.dll 6.2.19041.3636 +00007FFF959A0000-00007FFF95E0E000 SETUPAPI.dll 6.2.19041.4355 +00007FFF3DEB0000-00007FFF3E02A000 sqlite3.dll +00007FFF93670000-00007FFF936BE000 cfgmgr32.dll 6.2.19041.3996 +00007FFF3DBD0000-00007FFF3DD34000 vulkan-1.dll 1.3.216.0 +0000000064940000-0000000064955000 libwinpthread-1.dll 1.0.0.0 +00007FFF7F700000-00007FFF7F70B000 ktmw32.dll 6.2.19041.3636 +0000000062E80000-0000000062EA6000 zlib1.dll 1.2.11.0 +00007FFF573D0000-00007FFF574F8000 OPENGL32.dll 6.2.19041.4842 +00007FFF8AB30000-00007FFF8AB3E000 libssp-0.dll +00007FFF934F0000-00007FFF9351E000 USERENV.dll 6.2.19041.4355 +00007FFF53720000-00007FFF5376C000 steam_api.dll 7.30.20.28 +00007FFF8BA10000-00007FFF8BA1A000 VERSION.dll 6.2.19041.3636 +00007FFF71B50000-00007FFF71B62000 libogg.dll +00007FFF3F140000-00007FFF3F1D2000 libopus.dll +00007FFF889F0000-00007FFF88A17000 WINMM.dll 6.2.19041.3636 +00007FFF64AD0000-00007FFF64AFC000 GLU32.dll 6.2.19041.3636 +00007FFF92F00000-00007FFF92F0C000 CRYPTBASE.DLL 6.2.19041.3636 +00007FFF91FB0000-00007FFF920A6000 dxgi.dll 6.2.19041.4842 +00007FFF92FD0000-00007FFF92FE8000 CRYPTSP.dll 6.2.19041.3636 +00007FFF92640000-00007FFF92674000 rsaenh.dll 6.2.19041.3636 +00007FFF93F30000-00007FFF93FB2000 bcryptPrimitives.dll 6.2.19041.3636 +00007FFF3BB10000-00007FFF3BCA4000 gameoverlayrenderer64.dll 9.18.90.86 +00007FFF95520000-00007FFF95528000 PSAPI.DLL 6.2.19041.3636 +00007FFF91E40000-00007FFF91E52000 kernel.appcore.dll 6.2.19041.3758 +00007FFF90B70000-00007FFF90C0E000 uxtheme.dll 6.2.19041.4529 +00007FFF94310000-00007FFF943BD000 shcore.dll 6.2.19041.4522 +00007FFF66BE0000-00007FFF66C1F000 exchndl.dll 0.9.8.0 +00007FFF38900000-00007FFF389C2000 mgwhelp.dll 0.9.8.0 +00007FFF344C0000-00007FFF346B3000 dbghelp.dll 10.0.18362.1 +00007FFF65350000-00007FFF6537A000 dbgcore.DLL 10.0.18362.1 +00007FFF914F0000-00007FFF91C93000 windows.storage.dll 6.2.19041.4894 +00007FFF92F90000-00007FFF92FBE000 Wldp.dll 6.2.19041.4780 +00007FFF93570000-00007FFF93594000 profapi.dll 6.2.19041.4355 +00007FFF10060000-00007FFF117F7000 steamclient64.dll 9.18.90.86 +00007FFF940E0000-00007FFF940FD000 imagehlp.dll 6.2.19041.3636 +00007FFF92A20000-00007FFF92A5B000 IPHLPAPI.DLL 6.2.19041.3636 +00007FFF38760000-00007FFF38818000 vstdlib_s64.dll 9.18.90.86 +00007FFF35C90000-00007FFF35E2B000 tier0_s64.dll 9.18.90.86 +00007FFF92D70000-00007FFF92DDA000 MSWSOCK.dll 6.2.19041.3636 +00007FFF82390000-00007FFF8239C000 Secur32.dll 6.2.19041.3636 +00007FFF93520000-00007FFF93552000 SSPICLI.DLL 6.2.19041.4239 +00007FFF8B8C0000-00007FFF8B96E000 mscms.dll 6.2.19041.4648 +00007FFF8B850000-00007FFF8B861000 ColorAdapterClient.dll 6.2.19041.4648 +00007FFF8F150000-00007FFF8F196000 icm32.dll 6.2.19041.4648 +00007FFEE9740000-00007FFEEF334000 amdvlk64.dll 31.0.21912.14 +00007FFF85180000-00007FFF851B5000 amdihk64.dll 2.0.0.1788 +00007FFF93FC0000-00007FFF940D5000 MSCTF.dll 6.2.19041.4842 +00007FFF88760000-00007FFF88859000 textinputframework.dll 6.2.19041.4651 +00007FFF8FB70000-00007FFF8FC62000 CoreMessaging.dll 6.2.19041.4355 +00007FFF8F780000-00007FFF8FADB000 CoreUIComponents.dll 6.2.19041.3636 +00007FFF92890000-00007FFF928C3000 ntmarta.dll 6.2.19041.3636 +00007FFF8EF90000-00007FFF8F0E7000 wintypes.dll 6.2.19041.4717 +00007FFF3BA80000-00007FFF3BB10000 VkLayer_steam_fossilize64.dll +00007FFF3F100000-00007FFF3F13A000 SteamOverlayVulkanLayer64.dll +00007FFF3E560000-00007FFF3E5AB000 graphics-hook64.dll 1.7.1.0 +00007FFF90E80000-00007FFF90EAF000 dwmapi.dll 6.2.19041.4355 +00007FFF933D0000-00007FFF93403000 DEVOBJ.dll 6.2.19041.4355 +00007FFF93920000-00007FFF93989000 WINTRUST.dll 6.2.19041.4780 +00007FFF93200000-00007FFF93212000 MSASN1.dll 6.2.19041.3636 +00007FFF94910000-00007FFF949B9000 clbcatq.dll 2001.12.10941.16384 +00007FFF8FAE0000-00007FFF8FB65000 MMDevApi.dll 6.2.19041.4355 +00007FFF8CEE0000-00007FFF8CEEA000 avrt.dll 6.2.19041.3636 +00007FFF8FF40000-00007FFF900C1000 AUDIOSES.DLL 6.2.19041.4355 +00007FFF92B90000-00007FFF92BDB000 powrprof.dll 6.2.19041.3636 +00007FFF92A00000-00007FFF92A12000 UMPDC.dll +00007FFF862E0000-00007FFF8641F000 Windows.UI.dll 6.2.19041.4355 +00007FFF8BED0000-00007FFF8BF71000 WindowManagementAPI.dll +00007FFF85CD0000-00007FFF85E22000 InputHost.dll 6.2.19041.4355 +00007FFF8CBE0000-00007FFF8CDE3000 twinapi.appcore.dll 6.2.19041.4597 +00007FFF8DD40000-00007FFF8DE36000 PROPSYS.dll 7.0.19041.4597 +00007FFF90C50000-00007FFF90C64000 resourcepolicyclient.dll 6.2.19041.4355 +00007FFF84BE0000-00007FFF84C0E000 atig6pxx.dll 31.0.21912.14 +00007FFF8D3C0000-00007FFF8D4C2000 AppXDeploymentClient.dll 6.2.19041.4717 +00007FFF91E00000-00007FFF91E0D000 hid.dll 6.2.19041.3636 +00007FFF3E250000-00007FFF3E295000 dinput8.dll 6.2.19041.1 +00007FFF6DA90000-00007FFF6DAA1000 XInput1_4.dll 6.2.19041.3636 +00007FFF8A610000-00007FFF8A6F9000 Windows.Gaming.Input.dll 6.2.19041.4355 +00007FFF92A70000-00007FFF92B3A000 DNSAPI.dll 6.2.19041.4474 +00007FFF95530000-00007FFF95538000 NSI.dll 6.2.19041.3636 +00007FFF8AD10000-00007FFF8AD1A000 rasadhlp.dll 6.2.19041.3636 +00007FFF8AD20000-00007FFF8ADA0000 fwpuclnt.dll 6.2.19041.4123 +00007FFF92550000-00007FFF925E8000 schannel.DLL 6.2.19041.4597 +00007FFF88F80000-00007FFF88F95000 mskeyprotect.dll 6.2.19041.3636 +00007FFF930A0000-00007FFF930DB000 NTASN1.dll 6.2.19041.3636 +00007FFF930E0000-00007FFF93109000 ncrypt.dll 6.2.19041.4412 +00007FFF89490000-00007FFF894B6000 ncryptsslp.dll 6.2.19041.3636 +00007FFF84370000-00007FFF843E3000 symsrv.dll 10.0.18362.1 +00007FFF83AD0000-00007FFF83FA8000 wininet.dll 11.0.19041.4717 +00007FFF851F0000-00007FFF854AE000 iertutil.dll 11.0.19041.4894 +00007FFF851C0000-00007FFF851E8000 srvcli.dll 6.2.19041.3636 +00007FFF92A60000-00007FFF92A6C000 netutils.dll 6.2.19041.3636 +00007FFF7BA30000-00007FFF7BA47000 ondemandconnroutehelper.dll 6.2.19041.4355 +00007FFF8CF70000-00007FFF8D07D000 winhttp.dll 6.2.19041.4717 +00007FFF8DB30000-00007FFF8DB3B000 WINNSI.DLL 6.2.19041.3636 +00007FFF84E50000-00007FFF8503C000 urlmon.dll 11.0.19041.4894 + +Windows 6.2.19041.4842 +DrMingw 0.9.8 + diff --git a/scripts/android/cmake_android.sh b/scripts/android/cmake_android.sh index d541250a366..48da37d0620 100755 --- a/scripts/android/cmake_android.sh +++ b/scripts/android/cmake_android.sh @@ -142,7 +142,8 @@ function build_for_type() { -DCARGO_NDK_TARGET="${3}" \ -DCARGO_NDK_API="$ANDROID_API_LEVEL" \ -B"${BUILD_FOLDER}/$ANDROID_SUB_BUILD_DIR/$1" \ - -DSERVER=OFF \ + -DSERVER=ON \ + -DCLIENT=ON \ -DTOOLS=OFF \ -DDEV=TRUE \ -DCMAKE_CROSSCOMPILING=ON \ @@ -150,7 +151,7 @@ function build_for_type() { -DVIDEORECORDER=OFF ( cd "${BUILD_FOLDER}/$ANDROID_SUB_BUILD_DIR/$1" || exit 1 - cmake --build . --target game-client + cmake --build . --target game-server ) }