strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vcl2gnumake: #i116588# move vcl to gbuild (step 3,linux,solaris,macos)

Browse source
This commit is contained in:
Philipp Lohmann [pl] 2011-01-26 19:18:52 +01:00
parent 5094622556
commit 65bff13b5d
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Repository.mk
View file

@ -39,6 +39,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
AppleRemote \
avmedia \
basegfx \
basebmp \

12
solenv/config/sdev300.ini
View file

@ -923,6 +923,7 @@ unxlngx6
USE_SYSTEM_STL YES
XAU_LIBS -lXau
PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
}
common2
{
@ -946,7 +947,6 @@ unxlngx6
INPATH unxlngx6%PROEXT%
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
LIBMYSQL_PATH %SOLARROOT%/mysql-connector-c-6.0.2/unxlngx6
NO_BSYMBOLIC True
OJDK16PATH %SOLAR_OJDK16PATH%
@ -960,6 +960,10 @@ unxlngx6
SYSBASE %SOLAR_SYSBASE_ROOT%
TEMP /tmp
TMP /tmp
GTK_CFLAGS -I%SOLAR_SYSBASE_ROOT%/usr/include/gtk-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_SYSBASE_ROOT%/usr/include/atk-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/cairo -I%SOLAR_SYSBASE_ROOT%/usr/include/pango-1.0 -I%SOLAR_SYSBASE_ROOT%/usr/include/glib-2.0 -I%SOLAR_SYSBASE_ROOT%/usr/lib/glib-2.0/include
GTK_LIBS -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
KDE_CFLAGS -I%KDE_ROOT%/include -DQT_CLEAN_NAMESPACE
KDE_LIBS -L%KDE_ROOT%/lib -lkdeui -lkdecore -lqt-mt
}
common3:0 IF X%UPDATER%X == XX
{
@ -1473,6 +1477,7 @@ unxsoli4
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
SOLAR_GTK_ROOT /so/env/gnome/solaris_intel/cinnabar_b15
}
common2
{
@ -1502,6 +1507,8 @@ unxsoli4
SYSBASE %SOLAR_SYSBASE_ROOT%
TEMP /var/tmp
TMP /var/tmp
GTK_CFLAGS -I%SOLAR_GTK_ROOT%/usr/include/gtk-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_GTK_ROOT%/usr/include/atk-1.0 -I%SOLAR_GTK_ROOT%/usr/include/pango-1.0 -I/usr/openwin/include -I%SOLAR_GTK_ROOT%/usr/sfw/include -I%SOLAR_GTK_ROOT%/usr/sfw/include/freetype2 -I%SOLAR_GTK_ROOT%/usr/include/glib-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/glib-2.0/include
GTK_LIBS -L%SOLAR_GTK_ROOT%/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
}
compath
{
@ -1735,6 +1742,7 @@ unxsols4
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
SOLAR_GTK_ROOT /so/env/gnome/solaris_sparc/cinnabar_b15
}
common2
{
@ -1765,6 +1773,8 @@ unxsols4
SYSBASE %SOLAR_SYSBASE_ROOT%
TEMP /var/tmp
TMP /var/tmp
GTK_CFLAGS -I%SOLAR_GTK_ROOT%/usr/include/gtk-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/gtk-2.0/include -I%SOLAR_GTK_ROOT%/usr/include/atk-1.0 -I%SOLAR_GTK_ROOT%/usr/include/pango-1.0 -I/usr/openwin/include -I%SOLAR_GTK_ROOT%/usr/sfw/include -I%SOLAR_GTK_ROOT%/usr/sfw/include/freetype2 -I%SOLAR_GTK_ROOT%/usr/include/glib-2.0 -I%SOLAR_GTK_ROOT%/usr/lib/glib-2.0/include
GTK_LIBS -L%SOLAR_GTK_ROOT%/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0
}
common:3 IF %UPDATER% == YES
{

4
solenv/gbuild/platform/solaris.mk
View file

@ -218,10 +218,14 @@ endif
gb_Library_PLAINLIBS_NONE += \
dl \
freetype \
jpeg \
m \
pthread \
X11 \
Xext \
SM \
ICE \
z
gb_Library_FILENAMES := \