diff --git a/CMakeLists.txt b/CMakeLists.txt index b3b8573d4..ea982584c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -438,7 +438,6 @@ if (USE_SYSTEM_SOUNDTOUCH) endif() add_subdirectory(src) -add_subdirectory(dist/installer) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citra_meta) diff --git a/dist/installer/CMakeLists.txt b/dist/installer/CMakeLists.txt deleted file mode 100644 index 2217f8348..000000000 --- a/dist/installer/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ - -if(WIN32) - set(PLATFORM "windows") -elseif(APPLE) - set(PLATFORM "mac") -elseif(UNIX) - set(PLATFORM "linux") -else() - message(FATAL_ERROR "Cannot build installer for this unsupported platform") -endif() - -set(BUILD_DIR "${CMAKE_BINARY_DIR}/installer") -set(DIST_DIR "${BUILD_DIR}/dist") -set(TARGET_FILE "${DIST_DIR}/citra-setup-${PLATFORM}") - -file(MAKE_DIRECTORY "${BUILD_DIR}" "${DIST_DIR}") - -# Adds a custom target that will run the BuildInstaller.cmake file -# CMake can't just run a cmake function as a custom command, so this is a way around it. -# Calls the cmake command and runs a cmake file in "scripting" mode passing in variables with -D -add_custom_command(OUTPUT "${TARGET_FILE}" - COMMAND ${CMAKE_COMMAND} - -DBASE_DIR=${CMAKE_SOURCE_DIR} - -DSRC_DIR=${CMAKE_CURRENT_SOURCE_DIR} - -DBUILD_DIR=${BUILD_DIR} - -DTARGET_FILE=${TARGET_FILE} - -P ${CMAKE_SOURCE_DIR}/CMakeModules/BuildInstaller.cmake - WORKING_DIRECTORY ${BUILD_DIR} -) - -add_custom_target(installer DEPENDS ${TARGET_FILE}) diff --git a/dist/installer/README.md b/dist/installer/README.md deleted file mode 100644 index dc58093dd..000000000 --- a/dist/installer/README.md +++ /dev/null @@ -1,9 +0,0 @@ -Citra Qt Installer -================== - -This contains the configuration files for building Citra's installer. - -Installers can only be built on the platform that they are targeting. - -Build the `installer` target to generate the installer, and the installer will be in -${build_dir}/installer/dist/ diff --git a/dist/installer/config/config_linux.xml b/dist/installer/config/config_linux.xml deleted file mode 100644 index 12bb780b3..000000000 --- a/dist/installer/config/config_linux.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - Citra - 1.0.0 - Citra Updater - Citra Team - - @HomeDir@/.citra - /opt/citra - icon - icon.png - - - https://repo.citra-emu.org - 1 - Official Citra Repository - - - diff --git a/dist/installer/config/config_mac.xml b/dist/installer/config/config_mac.xml deleted file mode 100644 index 7fa6838b8..000000000 --- a/dist/installer/config/config_mac.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - Citra - 1.0.0 - Citra Updater - Citra Team - - @ApplicationsDir@/Citra - icon - icon.png - - - https://repo.citra-emu.org - 1 - Official Citra Repository - - - diff --git a/dist/installer/config/config_windows.xml b/dist/installer/config/config_windows.xml deleted file mode 100644 index 8281edd95..000000000 --- a/dist/installer/config/config_windows.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - Citra - 1.0.0 - Citra Updater - Citra Team - Citra - - @HomeDir@/AppData/Local/Citra - icon - icon.png - - - https://repo.citra-emu.org - 1 - Official Citra Repository - - - diff --git a/dist/installer/config/icon.icns b/dist/installer/config/icon.icns deleted file mode 100644 index 477e0c568..000000000 Binary files a/dist/installer/config/icon.icns and /dev/null differ diff --git a/dist/installer/config/icon.ico b/dist/installer/config/icon.ico deleted file mode 100644 index c53105288..000000000 Binary files a/dist/installer/config/icon.ico and /dev/null differ diff --git a/dist/installer/config/icon.png b/dist/installer/config/icon.png deleted file mode 100644 index fd102724c..000000000 Binary files a/dist/installer/config/icon.png and /dev/null differ