message("* qt/common")
+#include(cotire)
+#include(PrecompiledHeader)
+
set(s_qt_common_headers
- qt_dialogs.h
- qt_gldraw.h
- qt_glutil_gl2_0.h
- qt_glutil_gl3_0.h
emu_thread.h
- draw_thread.h
+ mainwidget.h
+ ../osd.h
)
-
-if(WITH_JOYSTICK)
- set(QT_COMMON_JOYSTICK_SRC joy_thread.cpp)
- set(s_qt_common_headers ${s_qt_common_headers} joy_thread.h)
+if(USE_SOCKET)
+ set(s_qt_common_headers ${s_qt_common_headers} ../osd_socket.h)
endif()
if(USE_QT_5)
QT4_WRAP_CPP(s_qt_common_headers_MOC ${s_qt_common_headers})
endif()
-set(QT_COMMON_BASE emuevents_control.cpp
- qt_gldraw.cpp
- qt_glutil.cpp
- qt_glutil_gl2_0.cpp
- qt_glutil_gl3_0.cpp
- qt_glevents.cpp
- qt_dialogs.cpp
- qt_main.cpp
+set(QT_COMMON_BASE
+ main.cpp
+ qt_utils.cpp
+ menu_flags.cpp
+
emu_thread.cpp
- draw_thread.cpp
- agar_logger.cpp
+ emu_thread_slots.cpp
+ util_fd2.cpp
+ util_hdd2.cpp
+# util_bubble2.cpp
+ util_main.cpp
+ ../osd.cpp
+ ../osd_wrapper.cpp
)
-if(USE_QT_5)
- QT5_ADD_RESOURCES(s_qt_common_RCC ${RESOURCE}
- ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/commontexts.qrc
- ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/shaders.qrc)
-else()
- QT4_ADD_RESOURCES(s_qt_common_RCC ${RESOURCE}
- ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/commontexts.qrc
- ${CMAKE_SOURCE_DIR}/../../src/qt/common/qrc/shaders.qrc)
-endif()
-add_executable(${EXEC_TARGET}
+ QT5_ADD_RESOURCES(s_qt_common_RCC ${RESOURCE}
+ ${CMAKE_CURRENT_SOURCE_DIR}/qrc/i18n_global.qrc
+ ${CMAKE_CURRENT_SOURCE_DIR}/qrc/icons.qrc)
+
+if(WIN32)
+ set(QT_COMMON_BASE ../gui/qt_main.cpp ${QT_COMMON_BASE} )
+
+ add_executable(${EXEC_TARGET}
+ WIN32
${QT_COMMON_BASE}
- ${QT_COMMON_JOYSTICK_SRC}
${s_qt_common_headers_MOC}
${s_qt_common_RCC}
-)
+ )
+ else()
+ add_executable(${EXEC_TARGET}
+ ${QT_COMMON_BASE}
+ ${s_qt_common_headers_MOC}
+ ${s_qt_common_RCC}
+ )
+# add_precompiled_header(${EXEC_TARGET} pch_list
+# SOURCE_CXX pch.cpp FORCEINCLUDE
+# )
+endif()
+#cotire(${EXEC_TARGET})
+
if(USE_QT_5)
if(USE_SOCKET)
QT5_USE_MODULES(${EXEC_TARGET} Widgets Core Gui OpenGL Network)
QT5_USE_MODULES(${EXEC_TARGET} Widgets Core Gui OpenGL)
endif()
endif()
-target_link_libraries(${EXEC_TARGET} ${LOCAL_LIBS} ${BUNDLE_LIBS})
+
+if(WIN32)
+
+find_package(Qt5Core)
+ #if(USE_FMGEN)
+ #${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPosd/build-win32/qt/osd/libqt_osd.a
+ #${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_gui.a
+ #${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPavio/build-win32/qt/avio/libqt_avio.a
+ # ${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPemu_utils/build-win32/qt/emuutils/libemu_utils.a
+ #${CMAKE_SOURCE_DIR}/../../build-cmake/libCSPgui/build-win32/qt/gui/libqt_gui.a
+
+ #endif()
+ target_link_libraries(${EXEC_TARGET}
+ ${LOCAL_LIBS}
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPemu_utils.dll.a
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPosd.dll.a
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPgui.dll.a
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPavio.dll.a
+# ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/avio.dll.a
+
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPfmgen.dll.a
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libvm_common_vm.a
+ #${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPcommon_vm.dll.a
+ ${CMAKE_SOURCE_DIR}/../../build-cmake/bin-win32/libCSPemu_utils.dll.a
+ ${BUNDLE_LIBS}
+ -lpthread
+ )
+else()
+ target_link_libraries(${EXEC_TARGET} ${LOCAL_LIBS} ${BUNDLE_LIBS} -lpthread)
+endif()
install(TARGETS ${EXEC_TARGET} DESTINATION bin)