Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix linux library

Browse source
This commit is contained in:
Victor Shcherb 2012-06-20 22:47:55 +02:00
parent 2d1cdf838c
commit 2a62f75063
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Osmand-kernel/osmand/Makefile
View file

@ -24,7 +24,7 @@ OSMAND_FLAGS_WINDOWS = \
LIBNAME = $(LIBRARY_PREFIX)osmand LIBNAME = $(LIBRARY_PREFIX)osmand
LIBTYPE = $(DYNAMICLIB_EXT) LIBTYPE = $(DYNAMICLIB_EXT)
LDLIBS += -Wl,--whole-archive -lskia -Wl,--no-whole-archive -lproto -lft2 -lexpat -lpng -lz LDLIBS += -Wl,-Bsymbolic -Wl,--whole-archive -lskia -lpng -Wl,--no-whole-archive -lproto -lft2 -lexpat -lz
ifeq ($(TARGET),windows) ifeq ($(TARGET),windows)
LDLIBS += -lwinmm -lgdi32 -lusp10 LDLIBS += -lwinmm -lgdi32 -lusp10

4
Osmand-kernel/skia/Makefile
View file

@ -50,10 +50,12 @@ ifeq ($(TARGET),windows)
SKIAFLAGS += $(SKIA_FLAGS_WINDOWS) SKIAFLAGS += $(SKIA_FLAGS_WINDOWS)
else else
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \
$(OSMAND_SKIA_LOC)/src/ports/SkFontHost_sandbox_none.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkThread_pthread.cpp \ $(OSMAND_SKIA_LOC)/src/ports/SkThread_pthread.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkTime_Unix.cpp \ $(OSMAND_SKIA_LOC)/src/ports/SkTime_Unix.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkFontHost_FreeType.cpp \ $(OSMAND_SKIA_LOC)/src/ports/SkFontHost_FreeType.cpp \
$(OSMAND_SKIA_LOC)/src/ports/SkFontHost_linux.cpp $(OSMAND_SKIA_LOC)/src/ports/SkFontHost_linux.cpp \
$(OSMAND_SKIA_LOC)/src/core/SkMMapStream.cpp
SKIAFLAGS += \ SKIAFLAGS += \
-DSK_BUILD_FOR_UNIX -DSK_BUILD_FOR_UNIX
endif endif