You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
1.7 KiB

  1. --- a/src/Mayaqua/Mayaqua.h
  2. +++ b/src/Mayaqua/Mayaqua.h
  3. @@ -283,7 +283,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow)
  4. #include <ifaddrs.h>
  5. #endif // MAYAQUA_SUPPORTS_GETIFADDRS
  6. -#ifdef UNIX_LINUX
  7. +#if 0
  8. typedef void *iconv_t;
  9. iconv_t iconv_open (__const char *__tocode, __const char *__fromcode);
  10. size_t iconv (iconv_t __cd, char **__restrict __inbuf,
  11. --- a/src/makefiles/linux_32bit.mak
  12. +++ b/src/makefiles/linux_32bit.mak
  13. @@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lrea
  14. OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
  15. -OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
  16. +OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -liconv -lpthread -lssl -lcrypto -lreadline -lncurses -lz
  17. INSTALL_BINDIR=/usr/bin/
  18. INSTALL_VPNSERVER_DIR=/usr/vpnserver/
  19. --- a/src/makefiles/linux_64bit.mak
  20. +++ b/src/makefiles/linux_64bit.mak
  21. @@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto
  22. OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
  23. -OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
  24. +OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -liconv -lpthread -lssl -lcrypto -lreadline -lncurses -lz
  25. INSTALL_BINDIR=/usr/bin/
  26. INSTALL_VPNSERVER_DIR=/usr/vpnserver/