Commits

Anonymous committed 62bf02d Merge

CWS-TOOLING: integrate CWS ause123

Comments (0)

Files changed (3)

libegg/source/makefile.mk

 
 # --- Targets ----------------------------------
 .ENDIF 		# L10N_framework
-.IF "$(OS)$(CPU)" == "LINUXX" && "$(LIBRARY_PATH)" != ""
-EXTRALIBPATHS+=-L$(LIBRARY_PATH)
-.ENDIF # "$(OS)$(CPU)" == "LINUXX"
 .INCLUDE : target.mk

solenv/config/sdev300.ini

 			WITH_LDAP YES
 			wrapper_override_cc_wrapper TRUE
 			MAXPROC maxproc=15
+            XINERAMA_LINK dynamic
 		}
 		common:0 IF %UPDATER% == YES
 		{
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
 			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			LIBRARY_PATH %SYSBASE%/usr/lib64
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/include/freetype2
 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
 			SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			DMAKEROOT %SOLARENV%/inc/startup
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
 			DMAKEROOT %SOLARENV%/inc/startup
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+            FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L%SYSBASE%/usr/sfw/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
 			SOLAR_JAVA TRUE
 			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
 			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%

vcl/util/makefile.mk

 .ENDIF
 .ENDIF
 
-.IF "$(OS)$(CPU)" == "LINUXX" && "$(LIBRARY_PATH)" != ""
-EXTRALIBPATHS+=-L$(LIBRARY_PATH)
-.ENDIF # "$(OS)$(CPU)" == "LINUXX"
 .ENDIF # "$(ENABLE_GTK)" != ""
 
 # KDE plugin