Changeset 153 in lab

Timestamp:

Jun 22, 2012 1:31:10 AM (12 years ago)

Author:

mitty

Message:

• add Makefile for mips-openwrt-linux
• fix declaration of iconv for mips-openwrt-linux

Location:

trunk/Dev/utvpn/utvpn-unix-v101-7101-public

Files:

• Makefile.mips (copied) (copied from trunk/Dev/utvpn/utvpn-unix-v101-7101-public/makefiles/linux_32bit_ja.mak) (4 diffs)
• src/Mayaqua/Mayaqua.h (modified) (2 diffs)

trunk/Dev/utvpn/utvpn-unix-v101-7101-public/Makefile.mips

@@ -28 +28 @@
 OPTIONS_COMPILE_DEBUG=-D_DEBUG -DDEBUG -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -g -fsigned-char
 
-OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
+OPTIONS_LINK_DEBUG=-g -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz -liconv
 
 OPTIONS_COMPILE_RELEASE=-DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char
 
-OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz
-
-INSTALL_BINDIR=/usr/bin/
-INSTALL_UTVPNSERVER_DIR=/usr/utvpnserver/
-INSTALL_UTVPNCLIENT_DIR=/usr/utvpnclient/
-INSTALL_UTVPNCMD_DIR=/usr/utvpncmd/
+OPTIONS_LINK_RELEASE=-O2 -fsigned-char -lm -ldl -lrt -lpthread -lssl -lcrypto -lreadline -lncurses -lz -liconv
+
+INSTALL_BINDIR=$(PREFIX)/usr/bin/
+INSTALL_UTVPNSERVER_DIR=$(PREFIX)/usr/utvpnserver/
+INSTALL_UTVPNCLIENT_DIR=$(PREFIX)/usr/utvpnclient/
+INSTALL_UTVPNCMD_DIR=$(PREFIX)/usr/utvpncmd/
 
 ifeq ($(DEBUG),YES)
@@ -308 +308 @@
     cp output/utvpnserver/hamcore.utvpn $(INSTALL_UTVPNSERVER_DIR)hamcore.utvpn
     cp output/utvpnserver/utvpnserver $(INSTALL_UTVPNSERVER_DIR)utvpnserver
+    @mkdir -p $(INSTALL_BINDIR)
     echo "#!/bin/sh" > $(INSTALL_BINDIR)utvpnserver
     echo $(INSTALL_UTVPNSERVER_DIR)utvpnserver '"$$@"' >> $(INSTALL_BINDIR)utvpnserver
@@ -317 +318 @@
     cp output/utvpnclient/hamcore.utvpn $(INSTALL_UTVPNCLIENT_DIR)hamcore.utvpn
     cp output/utvpnclient/utvpnclient $(INSTALL_UTVPNCLIENT_DIR)utvpnclient
+    @mkdir -p $(INSTALL_BINDIR)
     echo "#!/bin/sh" > $(INSTALL_BINDIR)utvpnclient
     echo $(INSTALL_UTVPNCLIENT_DIR)utvpnclient '"$$@"' >> $(INSTALL_BINDIR)utvpnclient
@@ -326 +328 @@
     cp output/utvpncmd/hamcore.utvpn $(INSTALL_UTVPNCMD_DIR)hamcore.utvpn
     cp output/utvpncmd/utvpncmd $(INSTALL_UTVPNCMD_DIR)utvpncmd
+    @mkdir -p $(INSTALL_BINDIR)
     echo "#!/bin/sh" > $(INSTALL_BINDIR)utvpncmd
     echo $(INSTALL_UTVPNCMD_DIR)utvpncmd '"$$@"' >> $(INSTALL_BINDIR)utvpncmd

trunk/Dev/utvpn/utvpn-unix-v101-7101-public/src/Mayaqua/Mayaqua.h

@@ -222 +222 @@
 
 #ifdef  UNIX_LINUX
+#include <iconv.h>
+/*
 typedef void *iconv_t;
 iconv_t iconv_open (__const char *__tocode, __const char *__fromcode);
@@ -229 +231 @@
                      size_t *__restrict __outbytesleft);
 int iconv_close (iconv_t __cd);
+*/
 #else   // UNIX_LINUX
 #include <iconv.h>