diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | jpeg/StaticLibrary_jpeg.mk | 8 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6b3b2e5bb489..81f412db2045 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -200,7 +200,7 @@ endef else # !SYSTEM_JPEG $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - jpeglib \ + jpeg \ )) define gb_LinkTarget__use_jpeg @@ -210,7 +210,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - jpeglib \ + jpeg \ ) endef diff --git a/jpeg/StaticLibrary_jpeg.mk b/jpeg/StaticLibrary_jpeg.mk index d4846e0a6035..91e3773064ac 100644 --- a/jpeg/StaticLibrary_jpeg.mk +++ b/jpeg/StaticLibrary_jpeg.mk @@ -7,13 +7,13 @@ # 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/jcapimin \ UnpackedTarball/jpeg/jcapistd \ diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 0f25a6b6fbfb..f705d5f0b8fb 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -193,11 +193,7 @@ MINIZIP3RDLIB=$(MINIZIP_LIBS) # internally, minizip is included in zlib MINIZIP3RDLIB= .ENDIF -.IF "$(SYSTEM_JPEG)"=="YES" JPEG3RDLIB=-ljpeg -.ELSE -JPEG3RDLIB=-ljpeglib -.ENDIF .IF "$(SYSTEM_DB)" == "YES" BERKELEYLIB=-l$(DB_LIB) .ELIF "$(GUI)$(COM)"=="WNTGCC" @@ -445,7 +441,7 @@ CLUCENELIB=iclucene.lib EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib ZLIB3RDLIB=zlib.lib -JPEG3RDLIB=jpeglib.lib +JPEG3RDLIB=jpeg.lib BERKELEYLIB=libdb47.lib CURLLIB=libcurl.lib CHAOSLIB=ichaos.lib |