diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-30 21:09:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-30 21:11:26 +0200 |
| commit | 3927d9bd2af2511679120effdc790c99180fdf83 (patch) | |
| tree | 0330446606cb0e039dec98992fc24cc739dc2e5b /external | |
| parent | 8a2776971de1e460bc38d11223d530eed7878296 (diff) | |
Add support for bundling the -system .dll's into the MinGW builds.
Diffstat (limited to 'external')
| -rw-r--r-- | external/gcc3_specific/makefile.mk | 44 | ||||
| -rw-r--r-- | external/prj/build.lst | 1 | ||||
| -rw-r--r-- | external/prj/d.lst | 3 |
3 files changed, 2 insertions, 46 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index fd45273cd475..501acfab69d6 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -6,48 +6,6 @@ TARGET=gcc3_specific .INCLUDE: settings.mk # ------------------------------------------------------------------ - -.IF "$(GUI)" == "WNT" - -.IF "$(COM)" == "GCC" - -.IF "$(MINGW_SHARED_GCCLIB)" == "YES" -MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL) -.ENDIF - -.IF "$(MINGW_SHARED_GXXLIB)" == "YES" -MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL) -.ENDIF - -all : $(MINGWGCCDLL) $(MINGWGXXDLL) - -# Guesstimate where $(MINGW_GCCDLL) and $(MINGW_GXXDLL) might be - -POTENTIAL_MINGW_RUNTIME_BINDIRS = \ - $(COMPATH)/i686-w64-mingw32/sys-root/mingw/bin \ - /usr/i686-w64-mingw32/sys-root/mingw/bin \ - -.IF "$(MINGW_SHARED_GCCLIB)" == "YES" -$(MINGWGCCDLL) : - @for D in $(POTENTIAL_MINGW_RUNTIME_BINDIRS); do \ - test -f $$D/$(MINGW_GCCDLL) && $(COPY) -p $$D/$(MINGW_GCCDLL) $(BIN)$/ && break; \ - done - @test -f $@ || (echo Could not find $(MINGW_GCCDLL) && exit 1) -.ENDIF - -$(MINGWGXXDLL) : -.IF "$(MINGW_SHARED_GXXLIB)" == "YES" - @for D in $(POTENTIAL_MINGW_RUNTIME_BINDIRS); do \ - test -f $$D/$(MINGW_GXXDLL) && $(COPY) -p $$D/$(MINGW_GXXDLL) $(BIN)$/ && break; \ - done - @test -f $@ || (echo Could not find $(MINGW_GXXDLL) && exit 1) - -.ENDIF - -.ENDIF - -.ELSE - .IF "$(SYSTEM_STDLIBS)" != "YES" && "$(COMID)"=="gcc3" .IF "$(OS)"!="MACOSX" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" @@ -81,7 +39,5 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) : .ENDIF -.ENDIF - .INCLUDE: target.mk diff --git a/external/prj/build.lst b/external/prj/build.lst index 7847f2431c5d..65665db53608 100644 --- a/external/prj/build.lst +++ b/external/prj/build.lst @@ -3,5 +3,6 @@ el external usr1 - all el_mkout NULL el external\glibc nmake - all el_glibc NULL el external\gcc3_specific nmake - all el_gcc3 NULL el external\mingwheaders nmake - w el_mingwheaders NULL +el external\mingw-dlls nmake - w el_mingwdlls NULL el external\jawt nmake - w el_jawt NULL el external\wine nmake - w el_wine NULL diff --git a/external/prj/d.lst b/external/prj/d.lst index b2edb8f3a647..d24455bc17ee 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -48,8 +48,7 @@ mkdir: %_DEST%\inc\external\wine ..\vcredist\vcredist_x86.exe %_DEST%\bin\vcredist_x86.exe ..\vcredist\vcredist_x64.exe %_DEST%\bin\vcredist_x64.exe -..\%__SRC%\bin\libgcc*.dll %_DEST%\bin\libgcc*.dll -..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin\libstdc++*.dll +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll ..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib\lib*.* |