gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows build fixes

Browse Source
This commit is contained in:
Joseph Henry
2017-11-06 16:19:55 -08:00
parent e0d4b84dd4
commit 614432907c
8 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -352,8 +352,8 @@ intercept:
$(ZT_INCLUDES) examples/intercept/intercept.cpp -D_GNU_SOURCE \ $(ZT_INCLUDES) examples/intercept/intercept.cpp -D_GNU_SOURCE \
-shared -o $(BUILD)/intercept.so $< -ldl -shared -o $(BUILD)/intercept.so $< -ldl
simple: simple:
$(CXX) $(CXXFLAGS) $(SANFLAGS) $(LIBZT_INCLUDES) $(LIBZT_DEFS) examples/bindings/cpp/simple_client_server/client.cpp -o $(BUILD)/client -L$(BUILD) -lzt $(CXX) $(CXXFLAGS) $(SANFLAGS) $(LIBZT_INCLUDES) $(LIBZT_DEFS) examples/bindings/cpp/simple_client_server/client.cpp -o $(BUILD)/client -L$(BUILD) -lzt $(WINDEFS)
$(CXX) $(CXXFLAGS) $(SANFLAGS) $(LIBZT_INCLUDES) $(LIBZT_DEFS) examples/bindings/cpp/simple_client_server/server.cpp -o $(BUILD)/server -L$(BUILD) -lzt $(CXX) $(CXXFLAGS) $(SANFLAGS) $(LIBZT_INCLUDES) $(LIBZT_DEFS) examples/bindings/cpp/simple_client_server/server.cpp -o $(BUILD)/server -L$(BUILD) -lzt $(WINDEFS)
dlltest: dlltest:
$(CXX) $(CXXFLAGS) $(CXX) $(CXXFLAGS)

13
examples/bindings/cpp/simple_client_server/client.cpp
View File

@@ -1,12 +1,19 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <arpa/inet.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#if defined(__linux__) || defined(__APPLE__)
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h>
#endif
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif
#include "libzt.h" #include "libzt.h"

17
examples/bindings/cpp/simple_client_server/server.cpp
View File

@@ -1,13 +1,20 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <arpa/inet.h>
#include <string.h> #include <string.h>
#include <netinet/in.h>
#include <netdb.h>
#include <string> #include <string>
#if defined(__linux__) || defined(__APPLE__)
#include <netinet/in.h>
#include <sys/socket.h>
#include <netdb.h>
#include <arpa/inet.h>
#endif
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif
#include "libzt.h" #include "libzt.h"
int main(int argc, char **argv) int main(int argc, char **argv)

18
include/libzt.h
View File

@@ -34,7 +34,20 @@
#define LIBZT_H #define LIBZT_H
#include "libztDebug.h" #include "libztDebug.h"
#include "sys/socket.h"
#include <stdlib.h>
#include <unistd.h>
#if defined(__linux__) || defined(__APPLE__)
#include <sys/socket.h>
#endif
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#include <WS2tcpip.h>
int inet_pton(int af, const char *src, void *dst);
#endif
/****************************************************************************/ /****************************************************************************/
/* DLL export for Windows (and other cruft) */ /* DLL export for Windows (and other cruft) */
@@ -44,9 +57,6 @@
typedef int ssize_t; typedef int ssize_t;
#endif #endif
#include <stdlib.h>
#include <unistd.h>
#if defined(__MING32__) || defined(__MING64__) #if defined(__MING32__) || defined(__MING64__)
#ifdef ADD_EXPORTS #ifdef ADD_EXPORTS
#define ZT_SOCKET_API __declspec(dllexport) #define ZT_SOCKET_API __declspec(dllexport)

2
src/SysUtils.cpp
View File

@@ -41,7 +41,9 @@
#include <sys/socket.h> #include <sys/socket.h>
#endif #endif
#if defined(__linux__) || defined(__APPLE__)
#include <sys/socket.h> #include <sys/socket.h>
#endif
#include "SysUtils.h" #include "SysUtils.h"
#include <stdint.h> #include <stdint.h>

7
src/Utilities.cpp
View File

@@ -30,10 +30,13 @@
* Misc utilities * Misc utilities
*/ */
//#include "libztDebug.h"
#include "Utilities.h" #include "Utilities.h"
#if defined(__MINGW32__) #if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#include <string.h>
int inet_pton4(const char *src, void *dst) int inet_pton4(const char *src, void *dst)
{ {

1
src/libzt.cpp
View File

@@ -49,7 +49,6 @@
#include "libztDebug.h" #include "libztDebug.h"
#include <string.h> #include <string.h>
//void * memcpy(void * dst, const void * src, size_t n);
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

15
test/selftest.cpp
View File

@@ -24,20 +24,27 @@
* of your own application. * of your own application.
*/ */
#include <unistd.h> #if defined(__linux__) || defined(__APPLE__)
#include <sys/socket.h> #include <sys/socket.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <arpa/inet.h>
#include <string.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <netdb.h> #include <netdb.h>
#include <poll.h>
#endif
#if defined(__MINGW32__) || defined(__MINGW64__)
#include <WinSock2.h>
#include <stdint.h>
#endif
#include <unistd.h>
#include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string> #include <string>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <poll.h>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>