Skip to content

Commit

Permalink
Remove the prior-version OS specific files (#4380)
Browse files Browse the repository at this point in the history
No longer needed in XT.

Closes #4337
  • Loading branch information
baconpaul authored Apr 23, 2021
1 parent 4ca0fa8 commit f471490
Show file tree
Hide file tree
Showing 13 changed files with 2 additions and 1,190 deletions.
14 changes: 2 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -352,15 +352,11 @@ set(SURGE_GUI_INCLUDES

### OS SPECIFIC SECTION
if( APPLE )
set(SURGE_OS_SOURCES
src/mac/objc_utils.mm
)
set(SURGE_OS_SOURCES)

set(SURGE_OS_GUI_SOURCES
)
set(SURGE_OS_GUI_SOURCES)

set(OS_INCLUDE_DIRECTORIES
src/mac
libs/simde
)
set(OS_COMPILE_DEFINITIONS
Expand Down Expand Up @@ -421,8 +417,6 @@ elseif( UNIX AND NOT APPLE )
)

set(OS_INCLUDE_DIRECTORIES
src/linux

${CAIRO_INCLUDE_DIRS}
${FONTCONFIG_INCLUDE_DIRS}
${X11_INCLUDE_DIRS}
Expand Down Expand Up @@ -485,7 +479,6 @@ elseif( WIN32 )

set(OS_INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
src/windows
${CMAKE_BINARY_DIR}/geninclude
)

Expand Down Expand Up @@ -535,9 +528,6 @@ source_group( "Surge GUI" REGULAR_EXPRESSION "src/common/gui" )
source_group( "Generated Code" REGULAR_EXPRESSION "version.cpp" )
source_group( "AU Plugin" REGULAR_EXPRESSION "src/au" )
source_group( "Headless" REGULAR_EXPRESSION "src/headless" )
source_group( "Linux" REGULAR_EXPRESSION "src/linux" )
source_group( "macOS" REGULAR_EXPRESSION "src/mac" )
source_group( "Windows" REGULAR_EXPRESSION "src/windows" )
source_group( "Surge XT Juce" REGULAR_EXPRESSION "src/surge_synth_juce" )
source_group( "Surge FX Juce" REGULAR_EXPRESSION "src/surge_effects_bank" )

Expand Down
7 changes: 0 additions & 7 deletions cmake/versiontools.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,3 @@ message( STATUS "Configuring ${SURGEBLD}/geninclude/version.cpp" )
configure_file( ${SURGESRC}/src/common/version.cpp.in
${SURGEBLD}/geninclude/version.cpp )

if( WIN32 )
message( STATUS "Configuring surgeversion.rc" )
configure_file( ${SURGESRC}/src/windows/surgeversion.rc.in
${SURGEBLD}/geninclude/surgeversion.rc
)
endif()

101 changes: 0 additions & 101 deletions src/common/gui/PopupEditorDialog.h

This file was deleted.

27 changes: 0 additions & 27 deletions src/common/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,30 +69,3 @@
#define IDB_VUMETER_BARS 181
#define IDB_MIDI_LEARN 182
// == /SVG == Do not remove this comment

#define IDC_NAME 1001
#define IDC_CATEGORY 1002
#define IDC_DESCRIPTION 1003
#define IDC_AUTHOR 1004
#define IDC_TEDIT 1024
#define IDC_TPROMPT 1025

#define IDR_LATO_FONT 501

// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 166
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1005
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

#if WINDOWS
#define SCALABLE_SVG_OFFSET 80000

#include "scalableresource.h" // found in src/windows

#endif
Loading

0 comments on commit f471490

Please sign in to comment.