Skip to content

Commit

Permalink
Fix build errors
Browse files Browse the repository at this point in the history 
bibledit/cloud#944
  • Loading branch information
@teusbenschop
teusbenschop committed Jul 28, 2024
1 parent 998c6fe commit 8139960
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 168 deletions.
48 changes: 7 additions & 41 deletions server/server.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,18 +386,13 @@
<ClCompile Include="mapping\index.cpp" />
<ClCompile Include="mapping\map.cpp" />
<ClCompile Include="mbedtls\aes.c" />
<ClCompile Include="mbedtls\aesce.c" />
<ClCompile Include="mbedtls\aesni.c" />
<ClCompile Include="mbedtls\arc4.c" />
<ClCompile Include="mbedtls\aria.c" />
<ClCompile Include="mbedtls\asn1parse.c" />
<ClCompile Include="mbedtls\asn1write.c" />
<ClCompile Include="mbedtls\base64.c" />
<ClCompile Include="mbedtls\bignum.c" />
<ClCompile Include="mbedtls\bignum_core.c" />
<ClCompile Include="mbedtls\bignum_mod.c" />
<ClCompile Include="mbedtls\bignum_mod_raw.c" />
<ClCompile Include="mbedtls\block_cipher.c" />
<ClCompile Include="mbedtls\blowfish.c" />
<ClCompile Include="mbedtls\camellia.c" />
<ClCompile Include="mbedtls\ccm.c" />
Expand All @@ -407,7 +402,6 @@
<ClCompile Include="mbedtls\cipher.c" />
<ClCompile Include="mbedtls\cipher_wrap.c" />
<ClCompile Include="mbedtls\cmac.c" />
<ClCompile Include="mbedtls\constant_time.c" />
<ClCompile Include="mbedtls\ctr_drbg.c" />
<ClCompile Include="mbedtls\debug.c" />
<ClCompile Include="mbedtls\des.c" />
Expand All @@ -417,87 +411,59 @@
<ClCompile Include="mbedtls\ecjpake.c" />
<ClCompile Include="mbedtls\ecp.c" />
<ClCompile Include="mbedtls\ecp_curves.c" />
<ClCompile Include="mbedtls\ecp_curves_new.c" />
<ClCompile Include="mbedtls\entropy.c" />
<ClCompile Include="mbedtls\entropy_poll.c" />
<ClCompile Include="mbedtls\error.c" />
<ClCompile Include="mbedtls\gcm.c" />
<ClCompile Include="mbedtls\havege.c" />
<ClCompile Include="mbedtls\hkdf.c" />
<ClCompile Include="mbedtls\hmac_drbg.c" />
<ClCompile Include="mbedtls\lmots.c" />
<ClCompile Include="mbedtls\lms.c" />
<ClCompile Include="mbedtls\md.c" />
<ClCompile Include="mbedtls\md2.c" />
<ClCompile Include="mbedtls\md4.c" />
<ClCompile Include="mbedtls\md5.c" />
<ClCompile Include="mbedtls\md_wrap.c" />
<ClCompile Include="mbedtls\memory_buffer_alloc.c" />
<ClCompile Include="mbedtls\mps_reader.c" />
<ClCompile Include="mbedtls\mps_trace.c" />
<ClCompile Include="mbedtls\net_sockets.c" />
<ClCompile Include="mbedtls\nist_kw.c" />
<ClCompile Include="mbedtls\oid.c" />
<ClCompile Include="mbedtls\padlock.c" />
<ClCompile Include="mbedtls\pem.c" />
<ClCompile Include="mbedtls\pk.c" />
<ClCompile Include="mbedtls\pkcs11.c" />
<ClCompile Include="mbedtls\pkcs12.c" />
<ClCompile Include="mbedtls\pkcs5.c" />
<ClCompile Include="mbedtls\pkcs7.c" />
<ClCompile Include="mbedtls\pkparse.c" />
<ClCompile Include="mbedtls\pkwrite.c" />
<ClCompile Include="mbedtls\pk_ecc.c" />
<ClCompile Include="mbedtls\pk_wrap.c" />
<ClCompile Include="mbedtls\platform.c" />
<ClCompile Include="mbedtls\platform_util.c" />
<ClCompile Include="mbedtls\poly1305.c" />
<ClCompile Include="mbedtls\psa_crypto.c" />
<ClCompile Include="mbedtls\psa_crypto_aead.c" />
<ClCompile Include="mbedtls\psa_crypto_cipher.c" />
<ClCompile Include="mbedtls\psa_crypto_client.c" />
<ClCompile Include="mbedtls\psa_crypto_driver_wrappers_no_static.c" />
<ClCompile Include="mbedtls\psa_crypto_ecp.c" />
<ClCompile Include="mbedtls\psa_crypto_ffdh.c" />
<ClCompile Include="mbedtls\psa_crypto_hash.c" />
<ClCompile Include="mbedtls\psa_crypto_mac.c" />
<ClCompile Include="mbedtls\psa_crypto_pake.c" />
<ClCompile Include="mbedtls\psa_crypto_rsa.c" />
<ClCompile Include="mbedtls\psa_crypto_se.c" />
<ClCompile Include="mbedtls\psa_crypto_slot_management.c" />
<ClCompile Include="mbedtls\psa_crypto_storage.c" />
<ClCompile Include="mbedtls\psa_its_file.c" />
<ClCompile Include="mbedtls\psa_util.c" />
<ClCompile Include="mbedtls\ripemd160.c" />
<ClCompile Include="mbedtls\rsa.c" />
<ClCompile Include="mbedtls\rsa_alt_helpers.c" />
<ClCompile Include="mbedtls\rsa_internal.c" />
<ClCompile Include="mbedtls\sha1.c" />
<ClCompile Include="mbedtls\sha256.c" />
<ClCompile Include="mbedtls\sha3.c" />
<ClCompile Include="mbedtls\sha512.c" />
<ClCompile Include="mbedtls\ssl_cache.c" />
<ClCompile Include="mbedtls\ssl_ciphersuites.c" />
<ClCompile Include="mbedtls\ssl_client.c" />
<ClCompile Include="mbedtls\ssl_cli.c" />
<ClCompile Include="mbedtls\ssl_cookie.c" />
<ClCompile Include="mbedtls\ssl_debug_helpers_generated.c" />
<ClCompile Include="mbedtls\ssl_msg.c" />
<ClCompile Include="mbedtls\ssl_srv.c" />
<ClCompile Include="mbedtls\ssl_ticket.c" />
<ClCompile Include="mbedtls\ssl_tls.c" />
<ClCompile Include="mbedtls\ssl_tls12_client.c" />
<ClCompile Include="mbedtls\ssl_tls12_server.c" />
<ClCompile Include="mbedtls\ssl_tls13_client.c" />
<ClCompile Include="mbedtls\ssl_tls13_generic.c" />
<ClCompile Include="mbedtls\ssl_tls13_keys.c" />
<ClCompile Include="mbedtls\ssl_tls13_server.c" />
<ClCompile Include="mbedtls\threading.c" />
<ClCompile Include="mbedtls\timing.c" />
<ClCompile Include="mbedtls\version.c" />
<ClCompile Include="mbedtls\version_features.c" />
<ClCompile Include="mbedtls\x509.c" />
<ClCompile Include="mbedtls\x509write.c" />
<ClCompile Include="mbedtls\x509write_crt.c" />
<ClCompile Include="mbedtls\x509write_csr.c" />
<ClCompile Include="mbedtls\x509_create.c" />
<ClCompile Include="mbedtls\x509_crl.c" />
<ClCompile Include="mbedtls\x509_crt.c" />
<ClCompile Include="mbedtls\x509_csr.c" />
<ClCompile Include="mbedtls\xtea.c" />
<ClCompile Include="menu\index.cpp" />
<ClCompile Include="menu\logic.cpp" />
<ClCompile Include="microtar\microtar.c" />
Expand Down
146 changes: 22 additions & 124 deletions server/server.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,21 +306,6 @@
<ClCompile Include="config\logic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\arc4.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\blowfish.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\certs.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\havege.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\md_wrap.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="session\logic.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -1176,10 +1161,10 @@
<ClCompile Include="mbedtls\aes.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\aesce.c">
<ClCompile Include="mbedtls\aesni.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\aesni.c">
<ClCompile Include="mbedtls\arc4.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\aria.c">
Expand All @@ -1197,16 +1182,7 @@
<ClCompile Include="mbedtls\bignum.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\bignum_core.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\bignum_mod.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\bignum_mod_raw.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\block_cipher.c">
<ClCompile Include="mbedtls\blowfish.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\camellia.c">
Expand All @@ -1215,6 +1191,9 @@
<ClCompile Include="mbedtls\ccm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\certs.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\chacha20.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -1230,9 +1209,6 @@
<ClCompile Include="mbedtls\cmac.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\constant_time.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ctr_drbg.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -1260,9 +1236,6 @@
<ClCompile Include="mbedtls\ecp_curves.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ecp_curves_new.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\entropy.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -1275,31 +1248,31 @@
<ClCompile Include="mbedtls\gcm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\hkdf.c">
<ClCompile Include="mbedtls\havege.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\hmac_drbg.c">
<ClCompile Include="mbedtls\hkdf.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\lmots.c">
<ClCompile Include="mbedtls\hmac_drbg.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\lms.c">
<ClCompile Include="mbedtls\md.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\md.c">
<ClCompile Include="mbedtls\md_wrap.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\md5.c">
<ClCompile Include="mbedtls\md2.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\memory_buffer_alloc.c">
<ClCompile Include="mbedtls\md4.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\mps_reader.c">
<ClCompile Include="mbedtls\md5.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\mps_trace.c">
<ClCompile Include="mbedtls\memory_buffer_alloc.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\net_sockets.c">
Expand All @@ -1320,16 +1293,13 @@
<ClCompile Include="mbedtls\pk.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\pk_ecc.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\pk_wrap.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\pkcs5.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\pkcs7.c">
<ClCompile Include="mbedtls\pkcs11.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\pkcs12.c">
Expand All @@ -1350,69 +1320,18 @@
<ClCompile Include="mbedtls\poly1305.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_aead.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_cipher.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_client.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_driver_wrappers_no_static.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_ecp.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_ffdh.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_hash.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_mac.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_pake.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_rsa.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_se.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_slot_management.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_crypto_storage.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_its_file.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\psa_util.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ripemd160.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\rsa.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\rsa_alt_helpers.c">
<ClCompile Include="mbedtls\rsa_internal.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\sha1.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\sha3.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\sha256.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -1425,16 +1344,13 @@
<ClCompile Include="mbedtls\ssl_ciphersuites.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_client.c">
<ClCompile Include="mbedtls\ssl_cli.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_cookie.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_debug_helpers_generated.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_msg.c">
<ClCompile Include="mbedtls\ssl_srv.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_ticket.c">
Expand All @@ -1443,24 +1359,6 @@
<ClCompile Include="mbedtls\ssl_tls.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_tls12_client.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_tls12_server.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_tls13_client.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_tls13_generic.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_tls13_keys.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\ssl_tls13_server.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\threading.c">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -1488,15 +1386,15 @@
<ClCompile Include="mbedtls\x509_csr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\x509write.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\x509write_crt.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\x509write_csr.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="mbedtls\xtea.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="assets\header.h">
Expand Down
Loading

0 comments on commit 8139960

Please sign in to comment.