diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/gcc3_specific/makefile.mk | 16 | ||||
| -rw-r--r-- | external/mingwheaders/makefile.mk | 2 | ||||
| -rw-r--r-- | external/mingwheaders/mingw_headers.patch | 13 | ||||
| -rw-r--r-- | external/prj/build.lst | 2 | ||||
| -rw-r--r-- | external/prj/d.lst | 2 |
5 files changed, 31 insertions, 4 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index e111d5c46138..889b61c1960c 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -8,6 +8,20 @@ TARGET=gcc3_specific .IF "$(BUILD_SPECIAL)"=="" + +.IF "$(GUI)" == "WNT" + +.IF "$(COM)" == "GCC" + +all : $(BIN)$/mingwm10.dll + +$(BIN)$/mingwm10.dll : + $(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/ + +.ENDIF + +.ELSE + .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" .IF "$(OS)"!="MACOSX" @@ -30,6 +44,8 @@ $(LB)$/libgcc_s.so.1 : .ENDIF .ENDIF + +.ENDIF .ENDIF # "$(BUILD_SPECIAL)"=="" diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk index 8e25bfccb9e0..9214303548d0 100644 --- a/external/mingwheaders/makefile.mk +++ b/external/mingwheaders/makefile.mk @@ -39,7 +39,7 @@ TARGET=mingwheaders # Cygwin and MinGW use different directories for the W32API headers .IF "$(USE_MINGW)" == "cygwin" -MINGW_INCLUDE_DIR=$/usr$/include/mingw/include/ +MINGW_INCLUDE_DIR=$/usr$/include/mingw/ MINGW_W32API_INCLUDE_DIR=$/usr$/include/w32api/ MINGW_W32API_LIB_DIR=$/usr$/include/w32api/ .ELSE diff --git a/external/mingwheaders/mingw_headers.patch b/external/mingwheaders/mingw_headers.patch index 1418137627b1..b6561ff497d1 100644 --- a/external/mingwheaders/mingw_headers.patch +++ b/external/mingwheaders/mingw_headers.patch @@ -296,7 +296,7 @@ } #endif --- include/objidl.h.orig 2006-11-19 08:08:34.000000000 +0900 -+++ include/objidl.h 2007-01-20 11:56:53.875000000 +0900 ++++ include/objidl.h 2008-11-30 11:56:53.875000000 +0900 @@ -1,3 +1,4 @@ +#include <ole2.h> #ifndef _OBJIDL_H @@ -345,6 +345,17 @@ DECLARE_ENUMERATOR(STATSTG); DECLARE_ENUMERATOR_(IEnumString,LPOLESTR); DECLARE_ENUMERATOR_(IEnumMoniker,_COM_interface IMoniker*); +@@ -880,8 +887,8 @@ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; +- STDMETHOD(AddConnection)(THIS_ DWORD,DWORD) PURE; +- STDMETHOD(ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE; ++ STDMETHOD_(DWORD,AddConnection)(THIS_ DWORD,DWORD) PURE; ++ STDMETHOD_(DWORD,ReleaseConnection)(THIS_ DWORD,DWORD,BOOL) PURE; + }; + #undef INTERFACE + @@ -927,6 +934,7 @@ }; #undef INTERFACE diff --git a/external/prj/build.lst b/external/prj/build.lst index 3fc0a6522be3..b187dafaf667 100644 --- a/external/prj/build.lst +++ b/external/prj/build.lst @@ -2,5 +2,5 @@ el external : SO:external_so soltools NULL el external usr1 - all el_mkout NULL el external\glibc nmake - all el_glibc NULL el external\gpc nmake - all el_gpc NULL -el external\gcc3_specific nmake - u el_gcc3 NULL +el external\gcc3_specific nmake - all el_gcc3 NULL el external\mingwheaders nmake - w el_mingwheaders NULL diff --git a/external/prj/d.lst b/external/prj/d.lst index 7652eafbdd1e..bc7d7c1211aa 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -57,7 +57,7 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\msi\instmsia.exe %_DEST%\bin%_EXT%\instmsia.exe ..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe -..\mingwm10\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll +..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll ..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib%_EXT%\lib*.* ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib |