Skip to content

Commit d33525b

Browse files
committed
support cross compiling with mxe and cmake
1 parent 4a231c5 commit d33525b

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

CMakeLists.txt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,15 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git)
9696
endif(EXISTS ${CMAKE_SOURCE_DIR}/.git)
9797
set_source_files_properties(src/AboutDialog.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/src/gen_version.h)
9898

99-
#icon for windows
99+
#icon and correct libs/subsystem for windows
100100
if(WIN32)
101101
IF( MINGW )
102102
# resource compilation for MinGW
103103
ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o
104-
COMMAND windres.exe -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/src/winapp.rc -o ${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o )
104+
COMMAND windres -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/src/winapp.rc -o ${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o )
105105
set(SQLB_SRC ${SQLB_SRC} ${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o)
106+
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,windows")
107+
set(ADDITIONAL_LIBS lcms lzma)
106108
ELSE( MINGW )
107109
set(SQLB_SRC ${SQLB_SRC} ${CMAKE_CURRENT_SOURCE_DIR}src/winapp.rc)
108110
ENDIF( MINGW )
@@ -116,23 +118,12 @@ add_dependencies(${PROJECT_NAME} antlr qhexedit)
116118

117119
link_directories(${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR})
118120

119-
target_link_libraries(${PROJECT_NAME} antlr qhexedit ${QT_LIBRARIES} sqlite3)
121+
target_link_libraries(${PROJECT_NAME} antlr qhexedit ${QT_LIBRARIES} sqlite3 ${ADDITIONAL_LIBS})
120122

121123
install(TARGETS ${PROJECT_NAME}
122124
RUNTIME DESTINATION bin
123125
LIBRARY DESTINATION lib)
124126

125-
if(WIN32)
126-
install(FILES
127-
${CMAKE_CURRENT_SOURCE_DIR}/dlls/libgcc_s_dw2-1.dll
128-
${CMAKE_CURRENT_SOURCE_DIR}/dlls/libsqlite3-0.dll
129-
${CMAKE_CURRENT_SOURCE_DIR}/dlls/libstdc++-6.dll
130-
${CMAKE_CURRENT_SOURCE_DIR}/dlls/mingwm10.dll
131-
${CMAKE_CURRENT_SOURCE_DIR}/dlls/QtCore4.dll
132-
${CMAKE_CURRENT_SOURCE_DIR}/dlls/QtGui4.dll
133-
DESTINATION bin)
134-
endif(WIN32)
135-
136127
#cpack
137128
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sqlite database browser UI")
138129
set(CPACK_PACKAGE_VENDOR "oldsch00l")

0 commit comments

Comments
 (0)