add stripping for Jinke builds

jack6th · Dec 29, 2009 · af138ff · af138ff
1 parent 9158303
commit af138ff
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 3 deletions.
diff --git a/README.TXT b/README.TXT
@@ -48,7 +48,7 @@ make
 # Building ARM version on OpenInkpot:
 mkdir armbuild
 cd armbuild
-cmake -D CMAKE_TOOLCHAIN_FILE=../tools/toolchain-arm-oi.cmake -D GUI=CRGUI_XCB ..
+cmake -D CMAKE_TOOLCHAIN_FILE=../tools/toolchain-arm-oi.cmake -D CMAKE_BUILD_TYPE=Release -D GUI=CRGUI_XCB ..
 make
 
 # Building Jinke/LBook V3 viewer plugin (libfb2.so):
@@ -62,11 +62,11 @@ make
 mkdir v3fb2propsbuild
 cd v3fb2propsbuild
 mkdir dest
-cmake -D CMAKE_TOOLCHAIN_FILE=../tools/toolchain-arm-v3.cmake -D GUI=FB2PROPS -D CMAKE_INSTALL_PREFIX=dest ..
+cmake -D CMAKE_TOOLCHAIN_FILE=../tools/toolchain-arm-v3.cmake -D GUI=FB2PROPS -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=dest ..
 make
 
 # Building Jinke/LBook V5 viewer app (cr3):
 mkdir v5build
 cd v5build
-cmake -D CMAKE_TOOLCHAIN_FILE=../tools/toolchain-arm-v5.cmake -D GUI=CRGUI_NANOX -D CMAKE_INSTALL_PREFIX=dest ..
+cmake -D CMAKE_TOOLCHAIN_FILE=../tools/toolchain-arm-v5.cmake -D GUI=CRGUI_NANOX -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=dest ..
 make
diff --git a/cr3gui/CMakeLists.txt b/cr3gui/CMakeLists.txt
@@ -132,10 +132,18 @@ endif ( ${GUI} STREQUAL CRGUI_XCB )
 if ( ${GUI} STREQUAL CRGUI_JINKE_PLUGIN )
     ADD_LIBRARY(fb2 SHARED ${CR3_SOURCES})
     TARGET_LINK_LIBRARIES(fb2 crengine tinydict ${EXTRA_LIBS} ${STD_LIBS})
+    if (DEFINED CMAKE_STRIP)
+       MESSAGE("Will execute  ${CMAKE_STRIP} ${CMAKE_BINARY_DIR}/cr3gui/libfb2.so" )
+       EXECUTE_PROCESS( COMMAND ${CMAKE_STRIP} ${CMAKE_BINARY_DIR}/cr3gui/libfb2.so )
+    endif (DEFINED CMAKE_STRIP)
     INSTALL( TARGETS fb2 LIBRARY DESTINATION ${CR3_BIN_DESTINATION} )
 else()
     ADD_EXECUTABLE(cr3 ${CR3_SOURCES})
     TARGET_LINK_LIBRARIES(cr3 crengine tinydict ${EXTRA_LIBS} ${STD_LIBS})
+    if (DEFINED CMAKE_STRIP)
+       MESSAGE("Will execute  ${CMAKE_STRIP} ${CMAKE_BINARY_DIR}/cr3gui/cr3" )
+       EXECUTE_PROCESS( COMMAND ${CMAKE_STRIP} ${CMAKE_BINARY_DIR}/cr3gui/cr3 )
+    endif (DEFINED CMAKE_STRIP)
     INSTALL( TARGETS cr3 RUNTIME DESTINATION ${CR3_BIN_DESTINATION} )
 endif ( ${GUI} STREQUAL CRGUI_JINKE_PLUGIN )
 

diff --git a/crengine/src/lvfntman.cpp b/crengine/src/lvfntman.cpp
@@ -1064,6 +1064,7 @@ class LVFontBoldTransform : public LVFont
     virtual bool getGlyphImage(lUInt16 code, lUInt8 * buf)
     {
         bool res = _baseFont->getGlyphImage( code, buf );
+        return res;
     }
 
     /// returns font baseline offset

diff --git a/tools/toolchain-arm-linux-gnueabi.cmake b/tools/toolchain-arm-linux-gnueabi.cmake
@@ -8,6 +8,7 @@ SET(CMAKE_SYSTEM_VERSION 1)
 # specify the cross compiler
 SET(CMAKE_C_COMPILER   /usr/bin/arm-linux-gnueabi-gcc)
 SET(CMAKE_CXX_COMPILER /usr/bin/arm-linux-gnueabi-g++)
+SET(CMAKE_STRIP /usr/bin/arm-linux-gnueabi-strip)
 
 # where is the target environment 
 SET(CMAKE_FIND_ROOT_PATH  /usr/arm-linux-gnueabi)

diff --git a/tools/toolchain-arm-v3.cmake b/tools/toolchain-arm-v3.cmake
@@ -8,6 +8,7 @@ SET(CMAKE_SYSTEM_VERSION 1)
 # specify the cross compiler
 SET(CMAKE_C_COMPILER   /opt/arm-9tdmi-linux-gnu/gcc-3.3.4-glibc-2.2.5/bin/arm-9tdmi-linux-gnu-gcc)
 SET(CMAKE_CXX_COMPILER /opt/arm-9tdmi-linux-gnu/gcc-3.3.4-glibc-2.2.5/bin/arm-9tdmi-linux-gnu-g++)
+SET(CMAKE_STRIP /opt/arm-9tdmi-linux-gnu/gcc-3.3.4-glibc-2.2.5/bin/arm-9tdmi-linux-gnu-strip)
 
 # where is the target environment 
 SET(CMAKE_FIND_ROOT_PATH  /opt/arm-9tdmi-linux-gnu/gcc-3.3.4-glibc-2.2.5/arm-9tdmi-linux-gnu)

diff --git a/tools/toolchain-arm-v5.cmake b/tools/toolchain-arm-v5.cmake
@@ -8,6 +8,7 @@ SET(CMAKE_SYSTEM_VERSION 1)
 # specify the cross compiler
 SET(CMAKE_C_COMPILER   /opt/arm-9tdmi-linux-gnu/gcc-4.0.0-glibc-2.3.5/bin/arm-9tdmi-linux-gnu-gcc)
 SET(CMAKE_CXX_COMPILER /opt/arm-9tdmi-linux-gnu/gcc-4.0.0-glibc-2.3.5/bin/arm-9tdmi-linux-gnu-g++)
+SET(CMAKE_STRIP /opt/arm-9tdmi-linux-gnu/gcc-4.0.0-glibc-2.3.5/bin/arm-9tdmi-linux-gnu-strip)
 
 # where is the target environment 
 SET(CMAKE_FIND_ROOT_PATH  /opt/arm-9tdmi-linux-gnu/gcc-4.0.0-glibc-2.3.5/arm-9tdmi-linux-gnu)