mirror of
https://github.com/shadowsocks/shadowsocks-libev.git
synced 2026-10-26 02:33:41 +00:00
Fix mingw building
This commit is contained in:
@@ -12149,6 +12149,27 @@ if test "$enable_pcre" != "no"; then
|
||||
fi
|
||||
|
||||
|
||||
if test "x$CFLAGS" = "x"; then
|
||||
test "x$verbose" = "xyes" && echo " setting CFLAGS to \"-DPCRE_STATIC\""
|
||||
CFLAGS="-DPCRE_STATIC"
|
||||
else
|
||||
ats_addto_bugger="-DPCRE_STATIC"
|
||||
for i in $ats_addto_bugger; do
|
||||
ats_addto_duplicate="0"
|
||||
for j in $CFLAGS; do
|
||||
if test "x$i" = "x$j"; then
|
||||
ats_addto_duplicate="1"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test $ats_addto_duplicate = "0"; then
|
||||
test "x$verbose" = "xyes" && echo " adding \"$i\" to CFLAGS"
|
||||
CFLAGS="$CFLAGS $i"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
if test "x$LDFLAGS" = "x"; then
|
||||
test "x$verbose" = "xyes" && echo " setting LDFLAGS to \"-L${pcre_ldflags}\""
|
||||
LDFLAGS="-L${pcre_ldflags}"
|
||||
|
||||
@@ -129,6 +129,7 @@ if test "$enable_pcre" != "no"; then
|
||||
pcre_have_libs=0
|
||||
if test "$pcre_base_dir" != "/usr"; then
|
||||
TS_ADDTO(CFLAGS, [-I${pcre_include}])
|
||||
TS_ADDTO(CFLAGS, [-DPCRE_STATIC])
|
||||
TS_ADDTO(LDFLAGS, [-L${pcre_ldflags}])
|
||||
TS_ADDTO_RPATH(${pcre_ldflags})
|
||||
fi
|
||||
|
||||
@@ -23,11 +23,17 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h> /* malloc() */
|
||||
#include <string.h> /* strncpy() */
|
||||
#include <strings.h> /* strncasecmp() */
|
||||
#include <ctype.h> /* isblank() */
|
||||
|
||||
#include "http.h"
|
||||
#include "protocol.h"
|
||||
|
||||
|
||||
@@ -24,9 +24,18 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef __MINGW32__
|
||||
extern void ss_error(const char *s);
|
||||
#endif
|
||||
|
||||
#include "rule.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <libcork/core.h>
|
||||
#include <libcork/ds.h>
|
||||
|
||||
#ifdef HAVE_PCRE_H
|
||||
@@ -56,5 +55,4 @@ void remove_rule(rule_t *);
|
||||
rule_t *new_rule();
|
||||
int accept_rule_arg(rule_t *, const char *);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -28,10 +28,20 @@
|
||||
* extension. This was created based primarily on Wireshark dissection of a
|
||||
* TLS handshake and RFC4366.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h> /* malloc() */
|
||||
#include <string.h> /* strncpy() */
|
||||
|
||||
#ifndef __MINGW32__
|
||||
#include <sys/socket.h>
|
||||
#else
|
||||
#include <win32.h>
|
||||
#endif
|
||||
|
||||
#include "tls.h"
|
||||
#include "protocol.h"
|
||||
|
||||
Reference in New Issue
Block a user