fixes for windows lib naming and Socket on Windows

IoLanguage · Dec 14, 2009 · ee48a22 · ee48a22
1 parent b46e75b
commit ee48a22
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -52,9 +52,10 @@ endif
 
 ifneq (,$(findstring Windows,$(SYS)))
 CC := cl -nologo
-DLL_LIB_PREFIX :=
+DLL_LIB_PREFIX := lib
 LINKDLL := link
 LINKDLLOUTFLAG :=-out:
+LINKLIBFLAG := lib
 DLL_SUFFIX := dll
 DLL_COMMAND := -dll -debug /INCREMENTAL:NO -subsystem:CONSOLE 
 DLL_EXTRA_LIBS := ws2_32.lib shell32.lib

diff --git a/Makefile.lib b/Makefile.lib
@@ -100,6 +100,7 @@ LINKDLLOUTFLAG :=-out:
 LINKDIRFLAG := -libpath:
 LINKLIBFLAG := lib
 DLL_LIB_SUFFIX := .lib
+DLL_LIB_PREFIX := lib
 DLL_COMMAND := -link /INCREMENTAL:NO -subsystem:WINDOWS -machine:X86 -DLL $(DEF_FILE)
 DLL_SUFFIX := dll
 DLL_EXTRAS := ws2_32.lib shell32.lib
@@ -111,8 +112,8 @@ endif
 ### FILES #########################################################
 
 NAME    := $(notdir $(subst $() ,_,$(shell pwd)))
-LIBR    := _build/lib/lib$(NAME).a
-DLL     := _build/dll/lib$(NAME).$(DLL_SUFFIX)
+LIBR    := _build/lib/$(DLL_LIB_PREFIX)$(NAME).a
+DLL     := _build/dll/$(DLL_LIB_PREFIX)$(NAME).$(DLL_SUFFIX)
 infiles := $(wildcard source/*.c) 
 #infiles += $(wildcard *.S)
 asmfiles := $(wildcard source/*.S)

diff --git a/addons/Socket/source/IoEvConnection.h b/addons/Socket/source/IoEvConnection.h
@@ -14,6 +14,7 @@
 
 #include "IoObject.h"
 #include "Socket.h"
+#include <evutil.h>
 #include <event.h>
 #include <evhttp.h>
 

diff --git a/addons/Socket/source/IoEvRequest.h b/addons/Socket/source/IoEvRequest.h
@@ -14,6 +14,7 @@
 
 #include "IoObject.h"
 #include "Socket.h"
+#include <evutil.h>
 #include <event.h>
 #include <evhttp.h>
 

diff --git a/addons/Socket/source/IoEventManager.h b/addons/Socket/source/IoEventManager.h
@@ -12,6 +12,7 @@ Selects on sockets and checks for timeouts.
 #include "IoSocket.h"
 #include "IoEvent.h"
 #include "Socket.h"
+#include <evutil.h>
 #include <event.h>
 #include <evhttp.h>
 

diff --git a/build/AddonBuilder.io b/build/AddonBuilder.io
@@ -11,9 +11,9 @@ AddonBuilder := Object clone do(
 		cc := method(System getEnvironmentVariable("CC") ifNilEval(return "cl -nologo"))
 		cxx := method(System getEnvironmentVariable("CXX") ifNilEval(return "cl -nologo"))
 		ccOutFlag := "-Fo"
-		linkdll := "link -link -nologo"
+		linkdll := "link -link -nologo /NODEFAULTLIB:LIBCMT"
 		linkDirPathFlag := "-libpath:"
-		linkLibFlag := ""
+		linkLibFlag := "lib"
 		linkOutFlag := "-out:"
 		linkLibSuffix := ".lib"
 		ar := "link -lib -nologo"

diff --git a/libs/basekit/Makefile.lib b/libs/basekit/Makefile.lib
@@ -98,9 +98,9 @@ ARFLAGS :=
 LINKDLL := link 
 LINKDLLOUTFLAG :=-out:
 LINKDIRFLAG := -libpath:
-LINKLIBFLAG := 
+LINKLIBFLAG := lib
 DLL_LIB_SUFFIX := .lib
-DLL_LIB_PREFIX :=
+DLL_LIB_PREFIX := lib
 DLL_COMMAND := -link /INCREMENTAL:NO -subsystem:WINDOWS -machine:X86 -DLL $(DEF_FILE)
 DLL_SUFFIX := dll
 DLL_EXTRAS := ws2_32.lib shell32.lib
@@ -112,8 +112,8 @@ endif
 ### FILES #########################################################
 
 NAME    := $(notdir $(subst $() ,_,$(shell pwd)))
-LIBR    := _build/lib/lib$(NAME).a
-DLL     := _build/dll/lib$(NAME).$(DLL_SUFFIX)
+LIBR    := _build/lib/$(DLL_LIB_PREFIX)$(NAME).a
+DLL     := _build/dll/$(DLL_LIB_PREFIX)$(NAME).$(DLL_SUFFIX)
 infiles := $(wildcard source/*.c) 
 #infiles += $(wildcard *.S)
 asmfiles := $(wildcard source/*.S)

diff --git a/libs/coroutine/Makefile.lib b/libs/coroutine/Makefile.lib
@@ -100,7 +100,7 @@ LINKDLLOUTFLAG :=-out:
 LINKDIRFLAG := -libpath:
 LINKLIBFLAG := lib
 DLL_LIB_SUFFIX := .lib
-DLL_LIB_PREFIX :=
+DLL_LIB_PREFIX := lib
 DLL_COMMAND := -link /INCREMENTAL:NO -subsystem:WINDOWS -machine:X86 -DLL $(DEF_FILE)
 DLL_SUFFIX := dll
 DLL_EXTRAS := ws2_32.lib shell32.lib
@@ -112,8 +112,8 @@ endif
 ### FILES #########################################################
 
 NAME    := $(notdir $(subst $() ,_,$(shell pwd)))
-LIBR    := _build/lib/lib$(NAME).a
-DLL     := _build/dll/lib$(NAME).$(DLL_SUFFIX)
+LIBR    := _build/lib/$(DLL_LIB_PREFIX)$(NAME).a
+DLL     := _build/dll/$(DLL_LIB_PREFIX)$(NAME).$(DLL_SUFFIX)
 infiles := $(wildcard source/*.c) 
 #infiles += $(wildcard *.S)
 asmfiles := $(wildcard source/*.S)

diff --git a/libs/garbagecollector/Makefile.lib b/libs/garbagecollector/Makefile.lib
@@ -100,7 +100,7 @@ LINKDLLOUTFLAG :=-out:
 LINKDIRFLAG := -libpath:
 LINKLIBFLAG := lib
 DLL_LIB_SUFFIX := .lib
-DLL_LIB_PREFIX :=
+DLL_LIB_PREFIX := lib
 DLL_COMMAND := -link /INCREMENTAL:NO -subsystem:WINDOWS -machine:X86 -DLL $(DEF_FILE)
 DLL_SUFFIX := dll
 DLL_EXTRAS := ws2_32.lib shell32.lib
@@ -112,8 +112,8 @@ endif
 ### FILES #########################################################
 
 NAME    := $(notdir $(subst $() ,_,$(shell pwd)))
-LIBR    := _build/lib/lib$(NAME).a
-DLL     := _build/dll/lib$(NAME).$(DLL_SUFFIX)
+LIBR    := _build/lib/$(DLL_LIB_PREFIX)$(NAME).a
+DLL     := _build/dll/$(DLL_LIB_PREFIX)$(NAME).$(DLL_SUFFIX)
 infiles := $(wildcard source/*.c) 
 #infiles += $(wildcard *.S)
 asmfiles := $(wildcard source/*.S)

diff --git a/tools/Makefile b/tools/Makefile
@@ -100,9 +100,9 @@ LFLAGS += ws2_32.lib kernel32.lib shell32.lib
 OPTIMIZE := -Zi -MD -DWIN32 -DNDEBUG -DBUILDING_IOVMALL_DLL -D_CRT_SECURE_NO_DEPRECATE
 WARN :=
 LINKDIRFLAG := -libpath:
-LINKLIBFLAG := 
+LINKLIBFLAG := lib
 DLL_LIB_SUFFIX := .lib
-DLL_LIB_PREFIX := 
+DLL_LIB_PREFIX := lib
 BINARY_SUFFIX := .exe
 endif