Merge pull request musescore#5913 from igorkorsukov/mue_module_import

Moved all imports/exports to importexport module
AntonioBL · Apr 11, 2020 · 667d4b2 · 667d4b2
2 parents f91dc43 + 7538f14
commit 667d4b2
Show file tree

Hide file tree

Showing 126 changed files with 251 additions and 171 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -787,8 +787,9 @@ if (BUILD_TELEMETRY_MODULE)
       add_subdirectory(telemetry)
       add_subdirectory(thirdparty/google_analytics)
 endif (BUILD_TELEMETRY_MODULE)
-add_subdirectory(global)
 
+add_subdirectory(global)
+add_subdirectory(importexport)
 add_subdirectory(mscore)
 add_subdirectory(main)
 
@@ -815,7 +816,6 @@ add_subdirectory(synthesizer)
 
 subdirs(
       awl bww2mxml share midi audiofile fluid libmscore
-      thirdparty/rtf2html thirdparty/beatroot
       thirdparty/qzip
       )
 

diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
@@ -26,30 +26,22 @@ else (APPLE)
         set(INCS "")
 endif (APPLE)
 
-add_library(bww STATIC
-   ${INCS}
-   lexer.cpp
-   parser.cpp
-   symbols.cpp
-   )
+set (BWW_DIR ${PROJECT_SOURCE_DIR}/importexport/bww)
 
-if (MSVC)
-   set_target_properties (
-      bww
-      PROPERTIES
-         COMPILE_FLAGS "${PCH_INCLUDE}"
+include_directories(
+      ${BWW_DIR}
       )
-endif (MSVC)
 
 if (NOT MINGW AND NOT APPLE AND NOT MSVC)
    add_executable(bww2mxml
       ${INCS}
-      lexer.cpp
+      ${BWW_SRC}
       main.cpp
       mxmlwriter.cpp
-      parser.cpp
-      symbols.cpp
-      writer.cpp
+      ${BWW_DIR}/writer.cpp
+      ${BWW_DIR}/lexer.cpp
+      ${BWW_DIR}/parser.cpp
+      ${BWW_DIR}/symbols.cpp
       )
 
    set_target_properties (
@@ -65,13 +57,3 @@ if (NOT MINGW AND NOT APPLE AND NOT MSVC)
    ADD_DEPENDENCIES(bww2mxml mops2)
 endif (NOT MINGW AND NOT APPLE AND NOT MSVC)
 
-xcode_pch(bww all)
-
-# Use MSVC pre-compiled headers
-vstudio_pch( bww )
-
-# MSVC does not depend on mops1 & mops2 for PCH
-if (NOT MSVC)
-   ADD_DEPENDENCIES(bww mops1)
-   ADD_DEPENDENCIES(bww mops2)
-endif (NOT MSVC)
diff --git a/importexport/CMakeLists.txt b/importexport/CMakeLists.txt
@@ -0,0 +1,90 @@
+#=============================================================================
+#  MuseScore
+#  Music Composition & Notation
+#
+#  Copyright (C) 2020 MuseScore BVBA and others
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License version 2.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#=============================================================================
+
+set(MODULE importexport)
+
+include (${PROJECT_SOURCE_DIR}/build/gch.cmake)
+
+include_directories(
+      ${PROJECT_SOURCE_DIR}
+      ${CMAKE_CURRENT_BINARY_DIR}
+      )
+
+if (NOT MSVC)
+   set(_all_h_file "${PROJECT_BINARY_DIR}/all.h")
+else (NOT MSVC)
+   set(_all_h_file "${PROJECT_SOURCE_DIR}/all.h")
+endif (NOT MSVC)
+
+
+include(${CMAKE_CURRENT_LIST_DIR}/musicxml/musicxml.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/midiimport/midiimport.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/midiexport/midiexport.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/ove/ove.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/guitarpro/guitarpro.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/musedata/musedata.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/bb/bb.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/capella/capella.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/bww/bww.cmake)
+
+add_library (
+      ${MODULE} STATIC
+      ${_all_h_file}
+      ${PCH}
+      ${MUSICXML_SRC}
+      ${MIDIIMPORT_SRC}
+      ${MIDIEXPORT_SRC}
+      ${OVE_SRC}
+      ${GUITARPRO_SRC}
+      ${MUSEDATA_SRC}
+      ${BB_SRC}
+      ${CAPELLA_SRC}
+      ${BWW_SRC}
+      )
+
+target_link_libraries(${MODULE}
+    ${QT_LIBRARIES}
+    midi        # for midi import
+    )
+
+if (NOT MSVC)
+   set_target_properties (
+      ${MODULE}
+      PROPERTIES
+         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+      )
+else (NOT MSVC)
+   set_target_properties (
+      ${MODULE}
+      PROPERTIES
+         COMPILE_FLAGS "${PCH_INCLUDE}"
+      )
+endif (NOT MSVC)   
+
+xcode_pch(${MODULE} all)
+
+# Use MSVC pre-compiled headers
+vstudio_pch( ${MODULE} )
+
+# MSVC does not depend on mops1 & mops2 for PCH
+if (NOT MSVC)
+   ADD_DEPENDENCIES(${MODULE} mops1)
+   ADD_DEPENDENCIES(${MODULE} mops2)
+endif (NOT MSVC)   
+
diff --git a/importexport/bb/bb.cmake b/importexport/bb/bb.cmake
@@ -0,0 +1,4 @@
+
+file(GLOB BB_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/*.*
+)
diff --git a/mscore/bb.cpp → importexport/bb/bb.cpp b/mscore/bb.cpp → importexport/bb/bb.cpp
diff --git a/mscore/bb.h → importexport/bb/bb.h b/mscore/bb.h → importexport/bb/bb.h
diff --git a/importexport/bww/bww.cmake b/importexport/bww/bww.cmake
@@ -0,0 +1,4 @@
+
+file(GLOB BWW_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/*.*
+)
diff --git a/mscore/importbww.cpp → importexport/bww/importbww.cpp b/mscore/importbww.cpp → importexport/bww/importbww.cpp
@@ -20,9 +20,9 @@
 // TODO LVI 2011-10-30: determine how to report import errors.
 // Currently all output (both debug and error reports) are done using qDebug.
 
-#include "bww2mxml/lexer.h"
-#include "bww2mxml/writer.h"
-#include "bww2mxml/parser.h"
+#include "lexer.h"
+#include "writer.h"
+#include "parser.h"
 
 #include "libmscore/fraction.h"
 #include "libmscore/barline.h"
@@ -44,8 +44,6 @@
 #include "libmscore/tuplet.h"
 #include "libmscore/volta.h"
 #include "libmscore/segment.h"
-#include "musescore.h"
-#include "musicxml.h"
 
 //---------------------------------------------------------
 //   addText

diff --git a/bww2mxml/lexer.cpp → importexport/bww/lexer.cpp b/bww2mxml/lexer.cpp → importexport/bww/lexer.cpp
diff --git a/bww2mxml/lexer.h → importexport/bww/lexer.h b/bww2mxml/lexer.h → importexport/bww/lexer.h
diff --git a/bww2mxml/parser.cpp → importexport/bww/parser.cpp b/bww2mxml/parser.cpp → importexport/bww/parser.cpp
diff --git a/bww2mxml/parser.h → importexport/bww/parser.h b/bww2mxml/parser.h → importexport/bww/parser.h
diff --git a/bww2mxml/symbols.cpp → importexport/bww/symbols.cpp b/bww2mxml/symbols.cpp → importexport/bww/symbols.cpp
diff --git a/bww2mxml/symbols.h → importexport/bww/symbols.h b/bww2mxml/symbols.h → importexport/bww/symbols.h
diff --git a/bww2mxml/writer.cpp → importexport/bww/writer.cpp b/bww2mxml/writer.cpp → importexport/bww/writer.cpp
diff --git a/bww2mxml/writer.h → importexport/bww/writer.h b/bww2mxml/writer.h → importexport/bww/writer.h
diff --git a/importexport/capella/capella.cmake b/importexport/capella/capella.cmake
@@ -0,0 +1,13 @@
+
+
+set (RTF2HTML_SRC
+    ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/fmt_opts.cpp
+    ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf2html.cpp
+    ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf_keyword.cpp
+    ${PROJECT_SOURCE_DIR}/thirdparty/rtf2html/rtf_table.cpp
+    )
+
+file(GLOB CAPELLA_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/*.*
+    ${RTF2HTML_SRC}
+    )
diff --git a/mscore/capella.cpp → importexport/capella/capella.cpp b/mscore/capella.cpp → importexport/capella/capella.cpp
diff --git a/mscore/capella.h → importexport/capella/capella.h b/mscore/capella.h → importexport/capella/capella.h
@@ -20,7 +20,6 @@
 #ifndef __CAPELLA_H__
 #define __CAPELLA_H__
 
-#include "globals.h"
 #include "libmscore/xml.h"
 
 namespace Ms {

diff --git a/mscore/capxml.cpp → importexport/capella/capxml.cpp b/mscore/capxml.cpp → importexport/capella/capxml.cpp
diff --git a/importexport/guitarpro/guitarpro.cmake b/importexport/guitarpro/guitarpro.cmake
@@ -0,0 +1,4 @@
+
+file(GLOB GUITARPRO_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/*.*
+)
diff --git a/mscore/importgtp-gp4.cpp → importexport/guitarpro/importgtp-gp4.cpp b/mscore/importgtp-gp4.cpp → importexport/guitarpro/importgtp-gp4.cpp
@@ -11,7 +11,7 @@
 //=============================================================================
 
 #include "importgtp.h"
-#include "globals.h"
+
 #include <libmscore/score.h>
 #include <libmscore/measurebase.h>
 #include <libmscore/text.h>

diff --git a/mscore/importgtp-gp5.cpp → importexport/guitarpro/importgtp-gp5.cpp b/mscore/importgtp-gp5.cpp → importexport/guitarpro/importgtp-gp5.cpp
@@ -11,7 +11,7 @@
 //=============================================================================
 
 #include "importgtp.h"
-#include "globals.h"
+
 #include <libmscore/score.h>
 #include <libmscore/measurebase.h>
 #include <libmscore/text.h>

diff --git a/mscore/importgtp-gp6.cpp → importexport/guitarpro/importgtp-gp6.cpp b/mscore/importgtp-gp6.cpp → importexport/guitarpro/importgtp-gp6.cpp
@@ -12,7 +12,7 @@
 //=============================================================================
 
 #include "importgtp.h"
-#include "globals.h"
+
 #include <libmscore/score.h>
 #include <libmscore/measurebase.h>
 #include <libmscore/text.h>

diff --git a/mscore/importgtp-gp7.cpp → importexport/guitarpro/importgtp-gp7.cpp b/mscore/importgtp-gp7.cpp → importexport/guitarpro/importgtp-gp7.cpp
diff --git a/mscore/importgtp.cpp → importexport/guitarpro/importgtp.cpp b/mscore/importgtp.cpp → importexport/guitarpro/importgtp.cpp
@@ -11,9 +11,11 @@
 //=============================================================================
 
 #include "importgtp.h"
+
 #include "importptb.h"
-#include "globals.h"
-#include "preferences.h"
+
+#include "mscore/preferences.h"
+
 #include <libmscore/measurebase.h>
 #include <libmscore/text.h>
 #include <libmscore/box.h>

diff --git a/mscore/importgtp.h → importexport/guitarpro/importgtp.h b/mscore/importgtp.h → importexport/guitarpro/importgtp.h
diff --git a/mscore/importptb.cpp → importexport/guitarpro/importptb.cpp b/mscore/importptb.cpp → importexport/guitarpro/importptb.cpp
diff --git a/mscore/importptb.h → importexport/guitarpro/importptb.h b/mscore/importptb.h → importexport/guitarpro/importptb.h
diff --git a/mscore/exportmidi.cpp → importexport/midiexport/exportmidi.cpp b/mscore/exportmidi.cpp → importexport/midiexport/exportmidi.cpp
@@ -11,19 +11,21 @@
 //=============================================================================
 
 #include "exportmidi.h"
-#include "midi/midifile.h"
+
 #include "libmscore/score.h"
 #include "libmscore/part.h"
 #include "libmscore/staff.h"
 #include "libmscore/tempo.h"
-#include "synthesizer/event.h"
 #include "libmscore/sig.h"
 #include "libmscore/key.h"
 #include "libmscore/text.h"
 #include "libmscore/measure.h"
 #include "libmscore/repeatlist.h"
 #include "libmscore/synthesizerstate.h"
-#include "preferences.h"
+
+#include "midi/midifile.h"
+#include "synthesizer/event.h"
+#include "mscore/preferences.h"
 
 namespace Ms {
 

diff --git a/mscore/exportmidi.h → importexport/midiexport/exportmidi.h b/mscore/exportmidi.h → importexport/midiexport/exportmidi.h
diff --git a/importexport/midiexport/midiexport.cmake b/importexport/midiexport/midiexport.cmake
@@ -0,0 +1,5 @@
+
+
+file(GLOB MIDIEXPORT_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/*.*
+    )
diff --git a/mscore/importmidi/importmidi.cpp → importexport/midiimport/importmidi.cpp b/mscore/importmidi/importmidi.cpp → importexport/midiimport/importmidi.cpp
diff --git a/mscore/importmidi/importmidi_beat.cpp → importexport/midiimport/importmidi_beat.cpp b/mscore/importmidi/importmidi_beat.cpp → importexport/midiimport/importmidi_beat.cpp
diff --git a/mscore/importmidi/importmidi_beat.h → importexport/midiimport/importmidi_beat.h b/mscore/importmidi/importmidi_beat.h → importexport/midiimport/importmidi_beat.h
diff --git a/mscore/importmidi/importmidi_chord.cpp → importexport/midiimport/importmidi_chord.cpp b/mscore/importmidi/importmidi_chord.cpp → importexport/midiimport/importmidi_chord.cpp
diff --git a/mscore/importmidi/importmidi_chord.h → importexport/midiimport/importmidi_chord.h b/mscore/importmidi/importmidi_chord.h → importexport/midiimport/importmidi_chord.h
diff --git a/mscore/importmidi/importmidi_chordname.cpp → ...xport/midiimport/importmidi_chordname.cpp b/mscore/importmidi/importmidi_chordname.cpp → ...xport/midiimport/importmidi_chordname.cpp
diff --git a/mscore/importmidi/importmidi_chordname.h → ...texport/midiimport/importmidi_chordname.h b/mscore/importmidi/importmidi_chordname.h → ...texport/midiimport/importmidi_chordname.h
diff --git a/mscore/importmidi/importmidi_clef.cpp → importexport/midiimport/importmidi_clef.cpp b/mscore/importmidi/importmidi_clef.cpp → importexport/midiimport/importmidi_clef.cpp
diff --git a/mscore/importmidi/importmidi_clef.h → importexport/midiimport/importmidi_clef.h b/mscore/importmidi/importmidi_clef.h → importexport/midiimport/importmidi_clef.h
diff --git a/mscore/importmidi/importmidi_drum.cpp → importexport/midiimport/importmidi_drum.cpp b/mscore/importmidi/importmidi_drum.cpp → importexport/midiimport/importmidi_drum.cpp
diff --git a/mscore/importmidi/importmidi_drum.h → importexport/midiimport/importmidi_drum.h b/mscore/importmidi/importmidi_drum.h → importexport/midiimport/importmidi_drum.h
diff --git a/mscore/importmidi/importmidi_fraction.cpp → ...export/midiimport/importmidi_fraction.cpp b/mscore/importmidi/importmidi_fraction.cpp → ...export/midiimport/importmidi_fraction.cpp
diff --git a/mscore/importmidi/importmidi_fraction.h → ...rtexport/midiimport/importmidi_fraction.h b/mscore/importmidi/importmidi_fraction.h → ...rtexport/midiimport/importmidi_fraction.h
diff --git a/mscore/importmidi/importmidi_inner.cpp → importexport/midiimport/importmidi_inner.cpp b/mscore/importmidi/importmidi_inner.cpp → importexport/midiimport/importmidi_inner.cpp
diff --git a/mscore/importmidi/importmidi_inner.h → importexport/midiimport/importmidi_inner.h b/mscore/importmidi/importmidi_inner.h → importexport/midiimport/importmidi_inner.h
diff --git a/mscore/importmidi/importmidi_instrument.cpp → ...port/midiimport/importmidi_instrument.cpp b/mscore/importmidi/importmidi_instrument.cpp → ...port/midiimport/importmidi_instrument.cpp
diff --git a/mscore/importmidi/importmidi_instrument.h → ...export/midiimport/importmidi_instrument.h b/mscore/importmidi/importmidi_instrument.h → ...export/midiimport/importmidi_instrument.h
diff --git a/mscore/importmidi/importmidi_key.cpp → importexport/midiimport/importmidi_key.cpp b/mscore/importmidi/importmidi_key.cpp → importexport/midiimport/importmidi_key.cpp
diff --git a/mscore/importmidi/importmidi_key.h → importexport/midiimport/importmidi_key.h b/mscore/importmidi/importmidi_key.h → importexport/midiimport/importmidi_key.h
diff --git a/mscore/importmidi/importmidi_lrhand.cpp → ...rtexport/midiimport/importmidi_lrhand.cpp b/mscore/importmidi/importmidi_lrhand.cpp → ...rtexport/midiimport/importmidi_lrhand.cpp
diff --git a/mscore/importmidi/importmidi_lrhand.h → importexport/midiimport/importmidi_lrhand.h b/mscore/importmidi/importmidi_lrhand.h → importexport/midiimport/importmidi_lrhand.h
diff --git a/mscore/importmidi/importmidi_lyrics.cpp → ...rtexport/midiimport/importmidi_lyrics.cpp b/mscore/importmidi/importmidi_lyrics.cpp → ...rtexport/midiimport/importmidi_lyrics.cpp
diff --git a/mscore/importmidi/importmidi_lyrics.h → importexport/midiimport/importmidi_lyrics.h b/mscore/importmidi/importmidi_lyrics.h → importexport/midiimport/importmidi_lyrics.h
diff --git a/mscore/importmidi/importmidi_meter.cpp → importexport/midiimport/importmidi_meter.cpp b/mscore/importmidi/importmidi_meter.cpp → importexport/midiimport/importmidi_meter.cpp
diff --git a/mscore/importmidi/importmidi_meter.h → importexport/midiimport/importmidi_meter.h b/mscore/importmidi/importmidi_meter.h → importexport/midiimport/importmidi_meter.h
diff --git a/mscore/importmidi/importmidi_model.cpp → importexport/midiimport/importmidi_model.cpp b/mscore/importmidi/importmidi_model.cpp → importexport/midiimport/importmidi_model.cpp
diff --git a/mscore/importmidi/importmidi_model.h → importexport/midiimport/importmidi_model.h b/mscore/importmidi/importmidi_model.h → importexport/midiimport/importmidi_model.h
diff --git a/mscore/importmidi/importmidi_operation.h → ...texport/midiimport/importmidi_operation.h b/mscore/importmidi/importmidi_operation.h → ...texport/midiimport/importmidi_operation.h
diff --git a/mscore/importmidi/importmidi_operations.cpp → ...port/midiimport/importmidi_operations.cpp b/mscore/importmidi/importmidi_operations.cpp → ...port/midiimport/importmidi_operations.cpp
diff --git a/mscore/importmidi/importmidi_operations.h → ...export/midiimport/importmidi_operations.h b/mscore/importmidi/importmidi_operations.h → ...export/midiimport/importmidi_operations.h
diff --git a/mscore/importmidi/importmidi_quant.cpp → importexport/midiimport/importmidi_quant.cpp b/mscore/importmidi/importmidi_quant.cpp → importexport/midiimport/importmidi_quant.cpp
diff --git a/mscore/importmidi/importmidi_quant.h → importexport/midiimport/importmidi_quant.h b/mscore/importmidi/importmidi_quant.h → importexport/midiimport/importmidi_quant.h
diff --git a/mscore/importmidi/importmidi_simplify.cpp → ...export/midiimport/importmidi_simplify.cpp b/mscore/importmidi/importmidi_simplify.cpp → ...export/midiimport/importmidi_simplify.cpp
diff --git a/mscore/importmidi/importmidi_simplify.h → ...rtexport/midiimport/importmidi_simplify.h b/mscore/importmidi/importmidi_simplify.h → ...rtexport/midiimport/importmidi_simplify.h
diff --git a/mscore/importmidi/importmidi_swing.cpp → importexport/midiimport/importmidi_swing.cpp b/mscore/importmidi/importmidi_swing.cpp → importexport/midiimport/importmidi_swing.cpp
diff --git a/mscore/importmidi/importmidi_swing.h → importexport/midiimport/importmidi_swing.h b/mscore/importmidi/importmidi_swing.h → importexport/midiimport/importmidi_swing.h
diff --git a/mscore/importmidi/importmidi_tempo.cpp → importexport/midiimport/importmidi_tempo.cpp b/mscore/importmidi/importmidi_tempo.cpp → importexport/midiimport/importmidi_tempo.cpp
diff --git a/mscore/importmidi/importmidi_tempo.h → importexport/midiimport/importmidi_tempo.h b/mscore/importmidi/importmidi_tempo.h → importexport/midiimport/importmidi_tempo.h
diff --git a/mscore/importmidi/importmidi_tie.cpp → importexport/midiimport/importmidi_tie.cpp b/mscore/importmidi/importmidi_tie.cpp → importexport/midiimport/importmidi_tie.cpp
diff --git a/mscore/importmidi/importmidi_tie.h → importexport/midiimport/importmidi_tie.h b/mscore/importmidi/importmidi_tie.h → importexport/midiimport/importmidi_tie.h
diff --git a/mscore/importmidi/importmidi_tuplet.cpp → ...rtexport/midiimport/importmidi_tuplet.cpp b/mscore/importmidi/importmidi_tuplet.cpp → ...rtexport/midiimport/importmidi_tuplet.cpp
diff --git a/mscore/importmidi/importmidi_tuplet.h → importexport/midiimport/importmidi_tuplet.h b/mscore/importmidi/importmidi_tuplet.h → importexport/midiimport/importmidi_tuplet.h
diff --git a/...e/importmidi/importmidi_tuplet_detect.cpp → ...t/midiimport/importmidi_tuplet_detect.cpp b/...e/importmidi/importmidi_tuplet_detect.cpp → ...t/midiimport/importmidi_tuplet_detect.cpp
diff --git a/mscore/importmidi/importmidi_tuplet_detect.h → ...ort/midiimport/importmidi_tuplet_detect.h b/mscore/importmidi/importmidi_tuplet_detect.h → ...ort/midiimport/importmidi_tuplet_detect.h
diff --git a/...e/importmidi/importmidi_tuplet_filter.cpp → ...t/midiimport/importmidi_tuplet_filter.cpp b/...e/importmidi/importmidi_tuplet_filter.cpp → ...t/midiimport/importmidi_tuplet_filter.cpp
diff --git a/mscore/importmidi/importmidi_tuplet_filter.h → ...ort/midiimport/importmidi_tuplet_filter.h b/mscore/importmidi/importmidi_tuplet_filter.h → ...ort/midiimport/importmidi_tuplet_filter.h
diff --git a/.../importmidi/importmidi_tuplet_tonotes.cpp → .../midiimport/importmidi_tuplet_tonotes.cpp b/.../importmidi/importmidi_tuplet_tonotes.cpp → .../midiimport/importmidi_tuplet_tonotes.cpp
diff --git a/...re/importmidi/importmidi_tuplet_tonotes.h → ...rt/midiimport/importmidi_tuplet_tonotes.h b/...re/importmidi/importmidi_tuplet_tonotes.h → ...rt/midiimport/importmidi_tuplet_tonotes.h
diff --git a/...re/importmidi/importmidi_tuplet_voice.cpp → ...rt/midiimport/importmidi_tuplet_voice.cpp b/...re/importmidi/importmidi_tuplet_voice.cpp → ...rt/midiimport/importmidi_tuplet_voice.cpp
diff --git a/mscore/importmidi/importmidi_tuplet_voice.h → ...port/midiimport/importmidi_tuplet_voice.h b/mscore/importmidi/importmidi_tuplet_voice.h → ...port/midiimport/importmidi_tuplet_voice.h
diff --git a/mscore/importmidi/importmidi_voice.cpp → importexport/midiimport/importmidi_voice.cpp b/mscore/importmidi/importmidi_voice.cpp → importexport/midiimport/importmidi_voice.cpp
diff --git a/mscore/importmidi/importmidi_voice.h → importexport/midiimport/importmidi_voice.h b/mscore/importmidi/importmidi_voice.h → importexport/midiimport/importmidi_voice.h
diff --git a/importexport/midiimport/midiimport.cmake b/importexport/midiimport/midiimport.cmake
@@ -0,0 +1,14 @@
+
+
+set (BEATROOT_SRC
+    ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/Agent.cpp
+    ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/AgentList.cpp
+    ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/BeatTracker.cpp
+    ${PROJECT_SOURCE_DIR}/thirdparty/beatroot/Induction.cpp
+    )
+
+
+file(GLOB MIDIIMPORT_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/*.*
+    ${BEATROOT_SRC}
+    )
diff --git a/importexport/musedata/musedata.cmake b/importexport/musedata/musedata.cmake
@@ -0,0 +1,4 @@
+
+file(GLOB MUSEDATA_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/*.*
+)
diff --git a/mscore/musedata.cpp → importexport/musedata/musedata.cpp b/mscore/musedata.cpp → importexport/musedata/musedata.cpp
diff --git a/mscore/musedata.h → importexport/musedata/musedata.h b/mscore/musedata.h → importexport/musedata/musedata.h
diff --git a/mscore/exportxml.cpp → importexport/musicxml/exportxml.cpp b/mscore/exportxml.cpp → importexport/musicxml/exportxml.cpp
@@ -36,8 +36,14 @@
 
 #include <math.h>
 #include "config.h"
-//#include "musescore.h"
-#include "file.h"
+
+#include "musicxml.h"
+#include "musicxmlfonthandler.h"
+
+#include "thirdparty/qzip/qzipwriter_p.h"
+
+#include "mscore/preferences.h"
+
 #include "libmscore/score.h"
 #include "libmscore/rest.h"
 #include "libmscore/chord.h"
@@ -52,7 +58,6 @@
 #include "libmscore/part.h"
 #include "libmscore/measure.h"
 #include "libmscore/style.h"
-#include "musicxml.h"
 #include "libmscore/slur.h"
 #include "libmscore/hairpin.h"
 #include "libmscore/dynamic.h"
@@ -84,21 +89,18 @@
 #include "libmscore/navigate.h"
 #include "libmscore/spanner.h"
 #include "libmscore/drumset.h"
-#include "preferences.h"
 #include "libmscore/mscore.h"
 #include "libmscore/accidental.h"
 #include "libmscore/breath.h"
 #include "libmscore/chordline.h"
 #include "libmscore/figuredbass.h"
 #include "libmscore/stringdata.h"
 #include "libmscore/rehearsalmark.h"
-#include "thirdparty/qzip/qzipwriter_p.h"
 #include "libmscore/fret.h"
 #include "libmscore/tie.h"
 #include "libmscore/undo.h"
 #include "libmscore/textline.h"
 #include "libmscore/fermata.h"
-#include "musicxmlfonthandler.h"
 #include "libmscore/textframe.h"
 #include "libmscore/instrchange.h"
 

diff --git a/mscore/importmxml.cpp → importexport/musicxml/importmxml.cpp b/mscore/importmxml.cpp → importexport/musicxml/importmxml.cpp
@@ -29,7 +29,8 @@
 #include "importmxmllogger.h"
 #include "importmxmlpass1.h"
 #include "importmxmlpass2.h"
-#include "preferences.h"
+
+#include "mscore/preferences.h"
 
 namespace Ms {
 

diff --git a/mscore/importmxml.h → importexport/musicxml/importmxml.h b/mscore/importmxml.h → importexport/musicxml/importmxml.h
diff --git a/mscore/importmxmllogger.cpp → importexport/musicxml/importmxmllogger.cpp b/mscore/importmxmllogger.cpp → importexport/musicxml/importmxmllogger.cpp
diff --git a/mscore/importmxmllogger.h → importexport/musicxml/importmxmllogger.h b/mscore/importmxmllogger.h → importexport/musicxml/importmxmllogger.h
diff --git a/mscore/importmxmlnoteduration.cpp → ...xport/musicxml/importmxmlnoteduration.cpp b/mscore/importmxmlnoteduration.cpp → ...xport/musicxml/importmxmlnoteduration.cpp
diff --git a/mscore/importmxmlnoteduration.h → ...texport/musicxml/importmxmlnoteduration.h b/mscore/importmxmlnoteduration.h → ...texport/musicxml/importmxmlnoteduration.h
diff --git a/mscore/importmxmlnotepitch.cpp → ...rtexport/musicxml/importmxmlnotepitch.cpp b/mscore/importmxmlnotepitch.cpp → ...rtexport/musicxml/importmxmlnotepitch.cpp
diff --git a/mscore/importmxmlnotepitch.h → importexport/musicxml/importmxmlnotepitch.h b/mscore/importmxmlnotepitch.h → importexport/musicxml/importmxmlnotepitch.h
diff --git a/mscore/importmxmlpass1.cpp → importexport/musicxml/importmxmlpass1.cpp b/mscore/importmxmlpass1.cpp → importexport/musicxml/importmxmlpass1.cpp
@@ -36,7 +36,8 @@
 #include "importmxmlnoteduration.h"
 #include "importmxmlpass1.h"
 #include "importmxmlpass2.h"
-#include "preferences.h"
+
+#include "mscore/preferences.h"
 
 namespace Ms {
 

diff --git a/mscore/importmxmlpass1.h → importexport/musicxml/importmxmlpass1.h b/mscore/importmxmlpass1.h → importexport/musicxml/importmxmlpass1.h
diff --git a/mscore/importmxmlpass2.cpp → importexport/musicxml/importmxmlpass2.cpp b/mscore/importmxmlpass2.cpp → importexport/musicxml/importmxmlpass2.cpp
@@ -72,7 +72,8 @@
 #include "importmxmlpass2.h"
 #include "musicxmlfonthandler.h"
 #include "musicxmlsupport.h"
-#include "preferences.h"
+
+#include "mscore/preferences.h"
 
 namespace Ms {
 

diff --git a/mscore/importmxmlpass2.h → importexport/musicxml/importmxmlpass2.h b/mscore/importmxmlpass2.h → importexport/musicxml/importmxmlpass2.h
diff --git a/mscore/importxml.cpp → importexport/musicxml/importxml.cpp b/mscore/importxml.cpp → importexport/musicxml/importxml.cpp
diff --git a/mscore/importxmlfirstpass.cpp → importexport/musicxml/importxmlfirstpass.cpp b/mscore/importxmlfirstpass.cpp → importexport/musicxml/importxmlfirstpass.cpp
diff --git a/mscore/importxmlfirstpass.h → importexport/musicxml/importxmlfirstpass.h b/mscore/importxmlfirstpass.h → importexport/musicxml/importxmlfirstpass.h
diff --git a/importexport/musicxml/musicxml.cmake b/importexport/musicxml/musicxml.cmake
@@ -0,0 +1,4 @@
+
+file(GLOB MUSICXML_SRC
+    ${CMAKE_CURRENT_LIST_DIR}/*.*
+)
diff --git a/mscore/musicxml.h → importexport/musicxml/musicxml.h b/mscore/musicxml.h → importexport/musicxml/musicxml.h
diff --git a/mscore/musicxmlfonthandler.cpp → ...rtexport/musicxml/musicxmlfonthandler.cpp b/mscore/musicxmlfonthandler.cpp → ...rtexport/musicxml/musicxmlfonthandler.cpp
diff --git a/mscore/musicxmlfonthandler.h → importexport/musicxml/musicxmlfonthandler.h b/mscore/musicxmlfonthandler.h → importexport/musicxml/musicxmlfonthandler.h