summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorGurusamy Sarathy <gsar@cpan.org>1998-02-17 01:47:35 +0000
committerGurusamy Sarathy <gsar@cpan.org>1998-02-17 01:47:35 +0000
commit4a52a3daffadd96cbf5882659a7b4be69a820252 (patch)
treedbc80aa3319afebbf653921460b10bb151d367ca /win32
parent3730b96e60864694cf0c222f80e6ed2b3c27335b (diff)
downloadperl-4a52a3daffadd96cbf5882659a7b4be69a820252.tar.gz
[win32] DLLs are now ok on mingw32/gcc-2.8.0 after removing the
FORCE_ARG_STRING() hack (that bug is fixed in gcc now). mingw32 build passes all tests except t/lib/io_xs.t (seems to be due to broken tmpfile() in the CRT or import lib) p4raw-id: //depot/win32/perl@530
Diffstat (limited to 'win32')
-rw-r--r--win32/makefile.mk10
-rw-r--r--win32/win32.h1
2 files changed, 5 insertions, 6 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 1e6c462573..a6efca0fb9 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -23,8 +23,8 @@ INST_TOP *= $(INST_DRV)\perl5004.5x
# uncomment one
#CCTYPE *= MSVC20
#CCTYPE *= MSVC
-#CCTYPE *= BORLAND
-CCTYPE *= GCC
+CCTYPE *= BORLAND
+#CCTYPE *= GCC
#
# uncomment next line if you want debug version of perl (big,slow)
@@ -43,8 +43,8 @@ CCTYPE *= GCC
#
# set the install locations of the compiler include/libraries
#CCHOME *= f:\msdev\vc
-#CCHOME *= C:\bc5
-CCHOME *= D:\packages\mingw32
+CCHOME *= C:\bc5
+#CCHOME *= D:\packages\mingw32
CCINCDIR *= $(CCHOME)\include
CCLIBDIR *= $(CCHOME)\lib
@@ -128,7 +128,7 @@ EXEOUT_FLAG = -e
.ELIF "$(CCTYPE)" == "GCC"
CC = gcc -pipe
-LINK32 = gcc
+LINK32 = gcc -pipe
LIB32 = ar
IMPLIB = dlltool
diff --git a/win32/win32.h b/win32/win32.h
index f730dea3aa..0eda0ed0e1 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -164,7 +164,6 @@ extern char * getlogin(void);
DllExport void Perl_win32_init(int *argcp, char ***argvp);
DllExport void Perl_init_os_extras(void);
-/*DllExport void win32_str_os_error(struct sv *s, DWORD err);*/
DllExport void win32_str_os_error(void *sv, DWORD err);
#ifndef USE_SOCKETS_AS_HANDLES