diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/gcc3_specific/makefile.mk | 20 | ||||
| -rw-r--r-- | external/gpc/makefile.mk | 57 | ||||
| -rw-r--r-- | external/prj/build.lst | 1 | ||||
| -rw-r--r-- | external/prj/d.lst | 9 |
4 files changed, 22 insertions, 65 deletions
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk index 889b61c1960c..fa409df5a707 100644 --- a/external/gcc3_specific/makefile.mk +++ b/external/gcc3_specific/makefile.mk @@ -13,11 +13,29 @@ TARGET=gcc3_specific .IF "$(COM)" == "GCC" -all : $(BIN)$/mingwm10.dll +.IF "$(MINGW_SHARED_GCCLIB)" == "YES" +MINGWGCCDLL=$(BIN)$/$(MINGW_GCCDLL) +.ENDIF + +.IF "$(MINGW_SHARED_GXXLIB)" == "YES" +MINGWGXXDLL=$(BIN)$/$(MINGW_GXXDLL) +.ENDIF + +all : $(BIN)$/mingwm10.dll $(MINGWGCCDLL) $(MINGWGXXDLL) $(BIN)$/mingwm10.dll : $(COPY) -p $(COMPATH)$/bin$/mingwm10.dll $(BIN)$/ +.IF "$(MINGW_SHARED_GCCLIB)" == "YES" +$(MINGWGCCDLL) : + $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GCCDLL) $(BIN)$/ +.ENDIF + +.IF "$(MINGW_SHARED_GXXLIB)" == "YES" +$(MINGWGXXDLL) : + $(COPY) -p $(COMPATH)$/bin$/$(MINGW_GXXDLL) $(BIN)$/ +.ENDIF + .ENDIF .ELSE diff --git a/external/gpc/makefile.mk b/external/gpc/makefile.mk deleted file mode 100644 index 7eba7b7a886e..000000000000 --- a/external/gpc/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.6 $ -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=external -TARGET=gpc -LIBTARGET=NO -EXTERNAL_WARNINGS_NOT_ERRORS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(BUILD_SPECIAL)"=="" -.IF "$(WITH_GPC)"!="NO" -SLOFILES = $(SLO)$/gpc.obj - -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1ARCHIV=$(LB)$/lib$(TARGET).a -LIB1OBJFILES=$(SLOFILES) -.ENDIF -.ENDIF # "$(BUILD_SPECIAL)"=="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/external/prj/build.lst b/external/prj/build.lst index b187dafaf667..20e0d4127964 100644 --- a/external/prj/build.lst +++ b/external/prj/build.lst @@ -1,6 +1,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 - 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 bc7d7c1211aa..2c50c4c6f801 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -1,6 +1,5 @@ mkdir: %_DEST%\inc%_EXT%\external mkdir: %_DEST%\inc%_EXT%\external\glibc -mkdir: %_DEST%\inc%_EXT%\external\gpc mkdir: %_DEST%\inc%_EXT%\external\mingw mkdir: %_DEST%\inc%_EXT%\external\mingw\include mkdir: %_DEST%\inc%_EXT%\external\mingw\include\atl @@ -8,7 +7,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\glibc\rtufiles\config.h %_DEST%\inc%_EXT%\external\glibc\config.h ..\glibc\rtufiles\getopt.h %_DEST%\inc%_EXT%\external\glibc\getopt.h -..\gpc\gpc.h %_DEST%\inc%_EXT%\external\gpc\gpc.h ..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a @@ -18,10 +16,6 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\* ..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\* -..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib -..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a -..\%__SRC%\lib\libgpc_static.a %_DEST%\lib%_EXT%\libgpc_static.a - ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.* ..\%__SRC%\lib\libgcc_s.so.1 %_DEST%\lib%_EXT%\libgcc_s.so.1 @@ -58,6 +52,9 @@ mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys ..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe ..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll +..\%__SRC%\bin\libgcc*.dll %_DEST%\bin%_EXT%\libgcc*.dll +..\%__SRC%\bin\libstdc++*.dll %_DEST%\bin%_EXT%\libstdc++*.dll + ..\%__SRC%\lib\libmsvcrt*.* %_DEST%\lib%_EXT%\lib*.* ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib |