but we keep getting blocked by incompatibilities under cygwin.
DEFINITIONS += __BUILD_STATIC_APPLICATION__=t
TARGETS = bundle_creator.exe
LAST_TARGETS += make_stub
DEFINITIONS += __BUILD_STATIC_APPLICATION__=t
TARGETS = bundle_creator.exe
LAST_TARGETS += make_stub
-ifeq "$(OP_SYSTEM)" "WIN32"
+ifeq "$(COMPILER)" "VISUAL_CPP"
LOCAL_HEADERS += $(THIRD_PARTY_DIR)/zlib/include
LOCAL_LIBRARIES += $(THIRD_PARTY_DIR)/zlib/lib
LIBS_USED += zlib.lib
LOCAL_HEADERS += $(THIRD_PARTY_DIR)/zlib/include
LOCAL_LIBRARIES += $(THIRD_PARTY_DIR)/zlib/lib
LIBS_USED += zlib.lib
-endif
-ifeq "$(OP_SYSTEM)" "UNIX"
endif
DEFINITIONS += __BUILD_STATIC_APPLICATION__=t
TARGETS = unpacker_stub.exe
endif
DEFINITIONS += __BUILD_STATIC_APPLICATION__=t
TARGETS = unpacker_stub.exe
-ifeq "$(OP_SYSTEM)" "WIN32"
+#ifeq "$(OP_SYSTEM)" "WIN32"
+ifeq "$(COMPILER)" "VISUAL_CPP"
LIBS_USED += libcmt.lib shlwapi.lib zlib.lib
LOAD_FLAG_PREFIX += -nodefaultlib:msvcrt.lib
COMPILER_FLAGS += -MT
LIBS_USED += libcmt.lib shlwapi.lib zlib.lib
LOAD_FLAG_PREFIX += -nodefaultlib:msvcrt.lib
COMPILER_FLAGS += -MT
#ifdef __UNIX__
#include <utime.h>
#endif
#ifdef __UNIX__
#include <utime.h>
#endif
#include <direct.h>
#include <io.h>
#include <shlobj.h>
#include <direct.h>
#include <io.h>
#include <shlobj.h>
ifeq "$(OMIT_VERSIONS)" ""
SOURCE += util_version.rc
endif
ifeq "$(OMIT_VERSIONS)" ""
SOURCE += util_version.rc
endif
-LOCAL_LIBS_USED = application basis configuration filesystem loggers mathematics nodes processes textual timely structures
+LOCAL_LIBS_USED = application configuration filesystem loggers mathematics nodes processes textual timely structures basis
TARGETS = await_app_exit.exe bytedump.exe checker.exe dirtree.exe ini_edit.exe mdate.exe \
splitter.exe time_set_effective_id.exe time_running_app.exe
TARGETS = await_app_exit.exe bytedump.exe checker.exe dirtree.exe ini_edit.exe mdate.exe \
splitter.exe time_set_effective_id.exe time_running_app.exe
return ::ioctl(socket, request, argp);
#endif
#ifdef __WIN32__
return ::ioctl(socket, request, argp);
#endif
#ifdef __WIN32__
- return ioctlsocket(socket, request, (un_long *)argp);
+ return ioctlsocket(socket, request, (un_int *)argp);
FD_ZERO(&write_list); FD_SET(socket, &write_list);
FD_ZERO(&exceptions); FD_SET(socket, &exceptions);
FD_ZERO(&write_list); FD_SET(socket, &write_list);
FD_ZERO(&exceptions); FD_SET(socket, &exceptions);
- timeval time_out;
- time_stamp::fill_timeval_ms(time_out, timeout);
+ timeval base_time_out;
+ time_stamp::fill_timeval_ms(base_time_out, timeout);
// timeval has tv_sec=seconds, tv_usec=microseconds.
// timeval has tv_sec=seconds, tv_usec=microseconds.
+#if !defined(__GNU_WINDOWS__)
+ timeval *time_out = &base_time_out;
+#elif defined(__GNU_WINDOWS__)
+ __ms_timeval win_time_out;
+ win_time_out.tv_sec = base_time_out.tv_sec;
+ win_time_out.tv_usec = base_time_out.tv_usec;
+ __ms_timeval *time_out = &win_time_out;
+#endif
// select will tell us about the socket.
int ret = ::select(socket + 1,
(mode & SELECTING_JUST_WRITE)? NIL : &read_list,
(mode & SELECTING_JUST_READ)? NIL : &write_list,
// select will tell us about the socket.
int ret = ::select(socket + 1,
(mode & SELECTING_JUST_WRITE)? NIL : &read_list,
(mode & SELECTING_JUST_READ)? NIL : &write_list,
- &exceptions, &time_out);
+ &exceptions, time_out);
int error = critical_events::system_error();
if (!ret) return 0; // nothing to report.
int error = critical_events::system_error();
if (!ret) return 0; // nothing to report.
FD_SET(sock, &write_list);
}
FD_SET(sock, &write_list);
}
- timeval time_out;
- time_stamp::fill_timeval_ms(time_out, timeout);
+ timeval base_time_out;
+ time_stamp::fill_timeval_ms(base_time_out, timeout);
// timeval has tv_sec=seconds, tv_usec=microseconds.
// timeval has tv_sec=seconds, tv_usec=microseconds.
+#if !defined(__GNU_WINDOWS__)
+ timeval *time_out = &base_time_out;
+#elif defined(__GNU_WINDOWS__)
+ __ms_timeval win_time_out;
+ win_time_out.tv_sec = base_time_out.tv_sec;
+ win_time_out.tv_usec = base_time_out.tv_usec;
+ __ms_timeval *time_out = &win_time_out;
+#endif
// select will tell us about the socket.
int ret = ::select(highest + 1,
(read_sox.length())? &read_list : NIL,
(write_sox.length())? &write_list : NIL,
// select will tell us about the socket.
int ret = ::select(highest + 1,
(read_sox.length())? &read_list : NIL,
(write_sox.length())? &write_list : NIL,
- &exceptions, &time_out);
+ &exceptions, time_out);
int error = critical_events::system_error();
if (ret == SOCKET_ERROR) {
int error = critical_events::system_error();
if (ret == SOCKET_ERROR) {
LOCAL_LIBS_USED = sockets unit_test application configuration loggers textual timely \
processes filesystem structures basis
VCPP_USE_SOCK = t
LOCAL_LIBS_USED = sockets unit_test application configuration loggers textual timely \
processes filesystem structures basis
VCPP_USE_SOCK = t
-ifeq "$(OP_SYSTEM)" "WIN32"
- LIBS_USED += ws2_32.lib
-endif
+#ifeq "$(COMPILER)" "VISUAL_CPP"
+# LIBS_USED += ws2_32.lib
+#endif
RUN_TARGETS = $(ACTUAL_TARGETS)
include cpp/rules.def
RUN_TARGETS = $(ACTUAL_TARGETS)
include cpp/rules.def
LOAD_FLAG_PREFIX += $(shell wx-config --libs $(UNICODE_FLAG_ADD) )
endif
LOAD_FLAG_PREFIX += $(shell wx-config --libs $(UNICODE_FLAG_ADD) )
endif
+LOAD_FLAG_PREFIX += -lwsock32 -lmswsock -shared
+
ifneq "$(USE_CURL)" ""
COMPILER_FLAGS += `curl-config --cflags`
LOAD_FLAG_SUFFIX += `curl-config --libs`
ifneq "$(USE_CURL)" ""
COMPILER_FLAGS += `curl-config --cflags`
LOAD_FLAG_SUFFIX += `curl-config --libs`
ifneq "$(USE_CURL)" ""
# # curl wants this win32 flag?
ifneq "$(USE_CURL)" ""
# # curl wants this win32 flag?
LOCAL_HEADERS += $(THIRD_PARTY_DIR)/curl/include
LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/curl/lib
# LIBS_USED += libcurl.dll.a
LOCAL_HEADERS += $(THIRD_PARTY_DIR)/curl/include
LIBRARY_SEARCH_PATH += $(THIRD_PARTY_DIR)/curl/lib
# LIBS_USED += libcurl.dll.a
endif
endif
ifeq "$(OP_SYSTEM)" "WIN32"
endif
endif
ifeq "$(OP_SYSTEM)" "WIN32"
- COMPILER := GNU_WINDOWS
-# COMPILER := VISUAL_CPP
+# COMPILER := GNU_WINDOWS
+ COMPILER := VISUAL_CPP
endif
ifeq "$(COMPILER)" ""
# if we get into this case, we have no idea how to set the default
endif
ifeq "$(COMPILER)" ""
# if we get into this case, we have no idea how to set the default