Applied patch [ 667563 ] Wine: compile fix for using glibc/msvcrt

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 1ad806f0602513d6dcb83825b63a003d20ed5c35..64c3072b129ec76e9ccb059fa0483d67b1bde316 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -59,6 +59,10 @@ doinit()
   cp $WXSRC/docs/mac/readme.txt $WXDEST/readme-mac-${WXVER}.txt
   cp $WXSRC/docs/mac/install.txt $WXDEST/install-mac-${WXVER}.txt
   cp $WXSRC/docs/os2/install.txt $WXDEST/install-os2-${WXVER}.txt
   cp $WXSRC/docs/mac/readme.txt $WXDEST/readme-mac-${WXVER}.txt
   cp $WXSRC/docs/mac/install.txt $WXDEST/install-mac-${WXVER}.txt
   cp $WXSRC/docs/os2/install.txt $WXDEST/install-os2-${WXVER}.txt

+
+  # Make .mo files
+  cd $WXSRC/locale
+  make allmo

 }
 
 dospinwxgtk()
 }
 
 dospinwxgtk()

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index ba67aac0045982069ec27afe886c3667f56662f4..63f06443ce28901965029b56967f0055385b2376 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -4,10 +4,10 @@ rem using Inno Setup + ScriptMaker
 set src=%wxwin
 set dest=%src\deliver
 set webfiles=c:\wx2dev\wxWebSite
 set src=%wxwin
 set dest=%src\deliver
 set webfiles=c:\wx2dev\wxWebSite

-set inno=1
+set inno=0

 
 Rem Set this to the required version
 
 Rem Set this to the required version

-set version=2.5.0
+set version=2.4.0

 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage


@@ -156,51 +156,71 @@ zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utils.rsp
 zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp
 zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp
 
 zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\utilmake.rsp
 zip32 -@ -u %dest\wxWindows-%version%-win.zip < %src\distrib\msw\univ.rsp
 

+echo Re-archiving wxWindows-%version%-win.zip

 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-win.zip wxWindows-%version% %dest%
 
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-win.zip wxWindows-%version% %dest%
 

-zip32 -d %dest%\wxWindows-%version%-win.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
+echo Removing .mms files
+zip32 -d %dest%\wxWindows-%version%-win.zip wxWindows-%version%/src/gtk/descrip.mms wxWindows-%version%/src/motif/descrip.mms

 
 

+echo Creating %dest\wxWindows-%version%-DocSource.zip

 zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-DocSource.zip wxWindows-%version% %dest%
 
 zip32 -@ %dest\wxWindows-%version%-DocSource.zip < %src\distrib\msw\docsrc.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-DocSource.zip wxWindows-%version% %dest%
 

+echo Creating %dest\wxWindows-%version%-WinHelp.zip

 zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-WinHelp.zip wxWindows-%version% %dest%
 
 zip32 -@ %dest\wxWindows-%version%-WinHelp.zip < %src\distrib\msw\wx_hlp.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-WinHelp.zip wxWindows-%version% %dest%
 

+echo Creating %dest\wxWindows-%version%-HTML.zip

 zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTML.zip wxWindows-%version% %dest%
 
 zip32 -@ %dest\wxWindows-%version%-HTML.zip < %src\distrib\msw\wx_html.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTML.zip wxWindows-%version% %dest%
 

+echo Creating %dest\wxWindows-%version%-PDF.zip

 zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-PDF.zip wxWindows-%version% %dest%
 
 Rem zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
 Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Word.zip wxWindows-%version% %dest%
 
 zip32 -@ %dest\wxWindows-%version%-PDF.zip < %src\distrib\msw\wx_pdf.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-PDF.zip wxWindows-%version% %dest%
 
 Rem zip32 -@ %dest\wxWindows-%version%-Word.zip < %src\distrib\msw\wx_word.rsp
 Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Word.zip wxWindows-%version% %dest%
 

+echo Creating %dest\wxWindows-%version%-HTB.zip

 zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTB.zip wxWindows-%version% %dest%
 
 zip32 -@ %dest\wxWindows-%version%-HTB.zip < %src\distrib\msw\wx_htb.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTB.zip wxWindows-%version% %dest%
 

+echo Creating %dest\wxWindows-%version%-HTMLHelp.zip

 zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTMLHelp.zip wxWindows-%version% %dest%
 
 zip32 -@ %dest\wxWindows-%version%-HTMLHelp.zip < %src\distrib\msw\wx_chm.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-HTMLHelp.zip wxWindows-%version% %dest%
 

+Rem Add Linuxy docs to a separate archive to be transported to Linux for the
+Rem Linux-based releases
+echo Creating %dest\wxWindows-%version%-LinuxDocs.zip
+zip32 -@ %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_pdf.rsp
+zip32 -@ -u %dest\wxWindows-%version%-LinuxDocs.zip < %src\distrib\msw\wx_htb.rsp
+

 Rem PDF/HTML docs that should go into the Windows setup because
 Rem there are no WinHelp equivalents
 Rem PDF/HTML docs that should go into the Windows setup because
 Rem there are no WinHelp equivalents

+echo Creating %dest\wxWindows-%version%-ExtraDoc.zip

 zip32 -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-ExtraDoc.zip wxWindows-%version% %dest%
 
 Rem zip up Univ-specific files
 zip32 -@ %dest\wxWindows-%version%-ExtraDoc.zip < %src\distrib\msw\extradoc.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-ExtraDoc.zip wxWindows-%version% %dest%
 
 Rem zip up Univ-specific files

+echo Creating %dest\wxWindows-%version%-Univ.zip

 zip32 -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Univ.zip wxWindows-%version% %dest%
 
 rem VC++ project files
 zip32 -@ %dest\wxWindows-%version%-Univ.zip < %src\distrib\msw\univ.rsp
 call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-Univ.zip wxWindows-%version% %dest%
 
 rem VC++ project files

+echo Creating %dest\wxWindows-%version%-VC.zip

 zip32 -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp
 zip32 -@ %dest\wxWindows-%version%-VC.zip < %src\distrib\msw\vc.rsp

-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest%
+Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-VC.zip wxWindows-%version% %dest%

 
 rem BC++ project files
 
 rem BC++ project files

+echo Creating %dest\wxWindows-%version%-BC.zip

 zip32 -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp
 zip32 -@ %dest\wxWindows-%version%-BC.zip < %src\distrib\msw\bc.rsp

-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest%
+Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-BC.zip wxWindows-%version% %dest%

 
 rem CodeWarrior project files
 
 rem CodeWarrior project files

+echo Creating %dest\wxWindows-%version%-CW.zip

 zip32 -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp
 zip32 -@ %dest\wxWindows-%version%-CW.zip < %src\distrib\msw\cw.rsp

-call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest%
+Rem call %WXWIN%\distrib\msw\rearchive wxWindows-%version%-CW.zip wxWindows-%version% %dest%

 
 rem Dialog Editor source and binary
 Rem erase %dest\dialoged-source.zip
 
 rem Dialog Editor source and binary
 Rem erase %dest\dialoged-source.zip


@@ -241,11 +261,17 @@ Rem zip32 %dest\tex2rtf-win32-%version%.zip tex2rtf.*
 
 cd %dest
 
 
 cd %dest
 

-rem Unzip the Windows files into 'wxWindows-%version%'
+rem Put all archives for transit to Linux in a zip file
+echo Creating %dest\wxWindows-%version%-LinuxTransit.zip
+erase %dest\wxWindows-%version%-LinuxTransit.zip
+zip32 %dest\wxWindows-%version%-LinuxTransit.zip wxWindows-%version%-LinuxDocs.zip wxWindows-%version%-VC.zip wxWindows-%version%-CW-Mac.zip
+
+echo Unzipping the Windows files into wxWindows-%version%

 
 unzip32 -o wxWindows-%version%-win.zip
 
 unzip32 -o wxWindows-%version%-win.zip

-unzip32 -o wxWindows-%version%-VC.zip
-unzip32 -o wxWindows-%version%-BC.zip
+unzip32 -o wxWindows-%version%-VC.zip -d wxWindows-%version
+unzip32 -o wxWindows-%version%-BC.zip -d wxWindows-%version
+unzip32 -o wxWindows-%version%-CW.zip -d wxWindows-%version

 unzip32 -o wxWindows-%version%-HTMLHelp.zip
 unzip32 -o wxWindows-%version%-ExtraDoc.zip
 Rem Need Word file, for Remstar DB classes
 unzip32 -o wxWindows-%version%-HTMLHelp.zip
 unzip32 -o wxWindows-%version%-ExtraDoc.zip
 Rem Need Word file, for Remstar DB classes

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b46955c5f9fff04cf5687135f212976b0bf911d2..2d99f34d50aa7871aa0eec41374aec4e83d98942 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1263,7 +1263,11 @@ bool wxMkdir(const wxString& dir, int perm)
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 #if (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 #if (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)

+  #ifndef MSVCRT

     if ( mkdir(wxFNCONV(dirname), perm) != 0 )
     if ( mkdir(wxFNCONV(dirname), perm) != 0 )

+  #else
+    if ( mkdir(wxFNCONV(dirname)) != 0 )
+  #endif

 #elif defined(__WXPM__)
     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
 #elif defined(__DOS__)
 #elif defined(__WXPM__)
     if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
 #elif defined(__DOS__)

diff --git a/src/makeg95.env b/src/makeg95.env
index d07503208f1e26d13f5e094f9942caba056c0c4d..5323dea56f8ebbb68711ad2a8f1d3cace0e03893 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -217,7 +217,12 @@ endif
 OPTIONS = -DSTRICT $(_USE_W32API_HEADER_IF_SUPPORTED)
 
 # Add "-mthreads" if you want to have threads under mingw32
 OPTIONS = -DSTRICT $(_USE_W32API_HEADER_IF_SUPPORTED)
 
 # Add "-mthreads" if you want to have threads under mingw32

-COMMON_THREADFLAGS =
+# Add "-mno-cygwin" if you want to link with msvcrt.dll in Cywin and Wine
+#                  Otherwise, you link against the native runtime (cygwin.dll or libc)
+#                  Having the flag in mingw32 does not hurt as you always link against msvcrt.dll
+#                  By default it should be on, to minimize dependencies on Cygwin, and
+#                  have more correct filename behaviour in Wine.
+COMMON_FLAGS = -mno-cygwin  # -mthreads

 
 # Debugging information
 ifeq ($(FINAL),0)
 
 # Debugging information
 ifeq ($(FINAL),0)


@@ -392,13 +397,13 @@ ALL_CPPFLAGS = $(XINCLUDE) $(INC) $(CPPFLAGS) $(EXTRACPPFLAGS)
 # C and C++ compiler flags for compatibility with old gcc versions
 REQUIRED_GCC_FLAGS = $(_STRUCT_RETURN_WORKAROUND) $(_THUNK_WORKAROUND)
 # C++ compiler flags
 # C and C++ compiler flags for compatibility with old gcc versions
 REQUIRED_GCC_FLAGS = $(_STRUCT_RETURN_WORKAROUND) $(_THUNK_WORKAROUND)
 # C++ compiler flags

-ALL_CXXFLAGS = $(COMMON_THREADFLAGS) $(REQUIRED_GCC_FLAGS) $(UNICODE_OPT) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CXXFLAGS)
+ALL_CXXFLAGS = $(COMMON_FLAGS) $(REQUIRED_GCC_FLAGS) $(UNICODE_OPT) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CXXFLAGS)

 # C compiler flags
 # C compiler flags

-ALL_CFLAGS   = $(COMMON_THREADFLAGS) $(REQUIRED_GCC_FLAGS) $(UNICODE_OPT) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CFLAGS)
+ALL_CFLAGS   = $(COMMON_FLAGS) $(REQUIRED_GCC_FLAGS) $(UNICODE_OPT) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CFLAGS)

 # Linker flags
 # Linker flags

-ALL_LDFLAGS  = $(COMMON_THREADFLAGS) $(WINDOWSLDFLAGS) $(WINDOWSLDLIBS) $(WXLIBDIRS) $(EXTRALDFLAGS) $(LDFLAGS)
+ALL_LDFLAGS  = $(COMMON_FLAGS) $(WINDOWSLDFLAGS) $(WINDOWSLDLIBS) $(WXLIBDIRS) $(EXTRALDFLAGS) $(LDFLAGS)

 # under Cygwin, Dlls must not be linked with subsystem=windows
 # under Cygwin, Dlls must not be linked with subsystem=windows

-ALL_LDFLAGS_DLL  = $(COMMON_THREADFLAGS) $(WINDOWSLDLIBS) $(WXLIBDIRS) $(EXTRALDFLAGS) $(LDFLAGS)
+ALL_LDFLAGS_DLL  = $(COMMON_FLAGS) $(WINDOWSLDLIBS) $(WXLIBDIRS) $(EXTRALDFLAGS) $(LDFLAGS)

   
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .cc .c
 
   
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .cc .c
 

diff --git a/src/msw/curico.cpp b/src/msw/curico.cpp
index 34b895da03c05cc7a510fd3622f90e16deb38f3b..572b231f7fe155738ee5e322af93f52174d1002d 100644 (file)
--- a/src/msw/curico.cpp
+++ b/src/msw/curico.cpp
@@ -16,7 +16,9 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include <io.h>
+#ifndef __UNIX__
+    #include <io.h>
+#endif

 #include <windows.h>
 
 #if defined(__MWERKS__)
 #include <windows.h>
 
 #if defined(__MWERKS__)

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index b83e43d9b012017c343c8a3f90755f9e44bea3e8..986e6602bfc713e5e4e46590a338429b4e75c68d 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -79,7 +79,9 @@
 #endif // USE_NET_API
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
 #endif // USE_NET_API
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)

-    #include <io.h>
+    #ifndef __UNIX__
+        #include <io.h>
+    #endif

 
     #ifndef __GNUWIN32__
         #include <shellapi.h>
 
     #ifndef __GNUWIN32__
         #include <shellapi.h>

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 3db9fa141966b2373fa02c2d3b643fbb242228de..b646c56ae2b2f7e2c525adb99e516c5c923c929a 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -60,7 +60,9 @@
 #endif
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
 #endif
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)

-#include <io.h>
+#ifndef __UNIX__
+    #include <io.h>
+#endif

 
 #ifndef __GNUWIN32__
 #include <shellapi.h>
 
 #ifndef __GNUWIN32__
 #include <shellapi.h>