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.

39 lines
2.0 KiB

  1. diff --git a/src/Mayaqua/Mayaqua.h b/src/Mayaqua/Mayaqua.h
  2. index 194f8e6..177129e 100644
  3. --- a/src/Mayaqua/Mayaqua.h
  4. +++ b/src/Mayaqua/Mayaqua.h
  5. @@ -283,7 +283,7 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, char *CmdLine, int CmdShow)
  6. #include <ifaddrs.h>
  7. #endif // MAYAQUA_SUPPORTS_GETIFADDRS
  8. -#ifdef UNIX_LINUX
  9. +#if 0
  10. typedef void *iconv_t;
  11. iconv_t iconv_open (__const char *__tocode, __const char *__fromcode);
  12. size_t iconv (iconv_t __cd, char **__restrict __inbuf,
  13. diff --git a/src/makefiles/linux_32bit.mak b/src/makefiles/linux_32bit.mak
  14. index 8219d5d..8020290 100644
  15. --- a/src/makefiles/linux_32bit.mak
  16. +++ b/src/makefiles/linux_32bit.mak
  17. @@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lrea
  18. 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
  19. -OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
  20. +OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -liconv -lpthread -lssl -lcrypto -lreadline -lncurses -lz
  21. INSTALL_BINDIR=/usr/bin/
  22. INSTALL_VPNSERVER_DIR=/usr/vpnserver/
  23. diff --git a/src/makefiles/linux_64bit.mak b/src/makefiles/linux_64bit.mak
  24. index 7f81b58..a36e0de 100644
  25. --- a/src/makefiles/linux_64bit.mak
  26. +++ b/src/makefiles/linux_64bit.mak
  27. @@ -68,7 +68,7 @@ OPTIONS_LINK_DEBUG=-g -fsigned-char -m64 -lm -ldl -lrt -lpthread -lssl -lcrypto
  28. 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
  29. -OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
  30. +OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -liconv -lpthread -lssl -lcrypto -lreadline -lncurses -lz
  31. INSTALL_BINDIR=/usr/bin/
  32. INSTALL_VPNSERVER_DIR=/usr/vpnserver/