mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not play stupid games with jpeg vs. jpeglib

Browse Source 
Change-Id: I72ed637ecec5aff7528ff724b2665e22650c224b
This commit is contained in:
David Tardon
2012-10-12 09:32:02 +02:00
parent 5c635140c7
commit 4ed91fd163
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RepositoryExternal.mk
View File

@@ -200,7 +200,7 @@ endef
else # !SYSTEM_JPEG else # !SYSTEM_JPEG
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
jpeglib \ jpeg \
)) ))
define gb_LinkTarget__use_jpeg define gb_LinkTarget__use_jpeg
@@ -210,7 +210,7 @@ $(call gb_LinkTarget_set_include,$(1),\
) )
$(call gb_LinkTarget_use_static_libraries,$(1),\ $(call gb_LinkTarget_use_static_libraries,$(1),\
jpeglib \ jpeg \
) )
endef endef

8
jpeg/StaticLibrary_jpeg.mk
View File

@@ -7,13 +7,13 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
$(eval $(call gb_StaticLibrary_StaticLibrary,jpeglib)) $(eval $(call gb_StaticLibrary_StaticLibrary,jpeg))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeglib)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,jpeg))
$(eval $(call gb_StaticLibrary_use_unpacked,jpeglib,jpeg)) $(eval $(call gb_StaticLibrary_use_unpacked,jpeg,jpeg))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeglib,\ $(eval $(call gb_StaticLibrary_add_generated_cobjects,jpeg,\
UnpackedTarball/jpeg/jaricom \ UnpackedTarball/jpeg/jaricom \
UnpackedTarball/jpeg/jcapimin \ UnpackedTarball/jpeg/jcapimin \
UnpackedTarball/jpeg/jcapistd \ UnpackedTarball/jpeg/jcapistd \

6
solenv/inc/libs.mk
View File

@@ -193,11 +193,7 @@ MINIZIP3RDLIB=$(MINIZIP_LIBS)
# internally, minizip is included in zlib # internally, minizip is included in zlib
MINIZIP3RDLIB= MINIZIP3RDLIB=
.ENDIF .ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
JPEG3RDLIB=-ljpeg JPEG3RDLIB=-ljpeg
.ELSE
JPEG3RDLIB=-ljpeglib
.ENDIF
.IF "$(SYSTEM_DB)" == "YES" .IF "$(SYSTEM_DB)" == "YES"
BERKELEYLIB=-l$(DB_LIB) BERKELEYLIB=-l$(DB_LIB)
.ELIF "$(GUI)$(COM)"=="WNTGCC" .ELIF "$(GUI)$(COM)"=="WNTGCC"
@@ -445,7 +441,7 @@ CLUCENELIB=iclucene.lib
EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
ZLIB3RDLIB=zlib.lib ZLIB3RDLIB=zlib.lib
JPEG3RDLIB=jpeglib.lib JPEG3RDLIB=jpeg.lib
BERKELEYLIB=libdb47.lib BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib CHAOSLIB=ichaos.lib