Skip to content

Commit 14ec4b9

Browse files
committed
Remove some obsolete common-x settings
1 parent 5e50a24 commit 14ec4b9

File tree

3 files changed

+6
-30
lines changed

3 files changed

+6
-30
lines changed

common-ios.xcconfig

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,14 @@ NSVG_PATH = $(IGRAPHICS_DEPS_PATH)/NanoSVG/src
7070
NVG_PATH = $(IGRAPHICS_DEPS_PATH)/NanoVG/src
7171
NVGMTL_PATH = $(IGRAPHICS_DEPS_PATH)/MetalNanoVG/src
7272
STB_PATH = $(DEPS_PATH)/IGraphics/STB
73-
IMGUI_PATH = $(DEPS_PATH)/IGraphics/imgui
7473
YOGA_PATH = $(DEPS_PATH)/IGraphics/yoga
7574

76-
IMGUI_INC_PATHS = $(IMGUI_PATH) $(IMGUI_PATH)/backends
77-
7875
SKIA_PATH = $(DEPS_PATH)/Build/src/skia
7976

8077
SKIA_INC_PATHS = $(SKIA_PATH)
8178
YOGA_INC_PATHS = $(YOGA_PATH) $(YOGA_PATH)/yoga
8279

83-
IGRAPHICS_INC_PATHS = $(IGRAPHICS_PATH) $(CONTROLS_PATH) $(PLATFORMS_PATH) $(DRAWING_PATH) $(NSVG_PATH) $(NVG_PATH) $(NVGMTL_PATH) $(SKIA_INC_PATHS) $(FT_PATH) $(STB_PATH) $(IMGUI_INC_PATHS) $(YOGA_INC_PATHS)
80+
IGRAPHICS_INC_PATHS = $(IGRAPHICS_PATH) $(CONTROLS_PATH) $(PLATFORMS_PATH) $(DRAWING_PATH) $(NSVG_PATH) $(NVG_PATH) $(NVGMTL_PATH) $(SKIA_INC_PATHS) $(FT_PATH) $(STB_PATH) $(YOGA_INC_PATHS)
8481

8582
LIB_SKIA = $(BUILT_LIBS_LIB_PATH)/libskia.a
8683
LIB_SKOTTIE = $(BUILT_LIBS_LIB_PATH)/libskottie.a

common-mac.xcconfig

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,10 @@ RTAUDIO_PATH = $(DEPS_PATH)/IPlug/RTAudio
6969
RTMIDI_PATH = $(DEPS_PATH)/IPlug/RTMidi
7070

7171
EXTRAS_PATH = $(IPLUG_PATH)/Extras
72-
IMGUI_PATH = $(DEPS_PATH)/IGraphics/imgui
73-
74-
//faust is linked as a dynamic library
75-
FAUST_LIB_PATHS = $(BUILT_LIBS_LIB_PATH)
76-
FAUST_INC_PATHS = $(BUILT_LIBS_INC_PATH)
77-
FAUST_LNK_FLAGS = $(BUILT_LIBS_LIB_PATH)/libfaust.dylib
78-
79-
CIVETWEB_INC_PATHS = $(BUILT_LIBS_INC_PATH)
80-
CIVETWEB_LNK_FLAGS = $(BUILT_LIBS_LIB_PATH)/libcivetweb.a
8172

8273
JSON_INC_PATH = $(DEPS_PATH)/Extras/nlohmann
8374

84-
EXTRAS_INC_PATHS = $(EXTRAS_PATH) $(EXTRAS_PATH)/Synth $(EXTRAS_PATH)/Faust $(EXTRAS_PATH)/OSC $(EXTRAS_PATH)/HIIR $(EXTRAS_PATH)/WebSocket $(CIVETWEB_INC_PATHS) $(JSON11_PATH) $(RTAUDIO_PATH) $(RTMIDI_PATH) $(JSON_INC_PATH)
75+
EXTRAS_INC_PATHS = $(EXTRAS_PATH) $(EXTRAS_PATH)/Synth $(EXTRAS_PATH)/OSC $(EXTRAS_PATH)/HIIR $(JSON11_PATH) $(RTAUDIO_PATH) $(RTMIDI_PATH) $(JSON_INC_PATH)
8576

8677
// Plug-in SDK paths
8778
VST2_SDK = $(DEPS_PATH)/IPlug/VST2_SDK
@@ -94,7 +85,7 @@ CLAP_HELPERS = $(DEPS_PATH)/IPlug/CLAP_HELPERS
9485
// this build setting is included at the xcode project level, since we need all these include paths
9586
IPLUG_INC_PATHS = $(PROJECT_ROOT) $(WDL_PATH) $(SWELL_PATH) $(SWELL_FOR_IPLUG_PATH) $(IPLUG_PATH) $(EXTRAS_INC_PATHS)
9687

97-
CLAP_INC_PATHS = $(CLAP_SDK)/include $(CLAP_HELPERS)/include/clap/helpers
88+
CLAP_INC_PATHS = $(IPLUG_PATH)/CLAP $(CLAP_SDK)/include $(CLAP_HELPERS)/include/clap/helpers
9889

9990
IGRAPHICS_PATH = $(IPLUG2_ROOT)/IGraphics
10091

common-win.props

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<IGRAPHICS_PATH>$(IPLUG2_ROOT)\IGraphics</IGRAPHICS_PATH>
1111
<DEPS_PATH>$(IPLUG2_ROOT)\Dependencies</DEPS_PATH>
1212
<JSON_PATH>$(DEPS_PATH)\Extras\nlohmann</JSON_PATH>
13-
<IPLUG_INC_PATHS>$(WDL_PATH);$(IPLUG_PATH);$(EXTRAS_PATH);$(EXTRAS_PATH)\OSC;$(EXTRAS_PATH)\Synth;$(EXTRAS_PATH)\Faust;$(EXTRAS_PATH)\WebView;$(JSON_PATH);$(SolutionDir)\resources</IPLUG_INC_PATHS>
13+
<IPLUG_INC_PATHS>$(WDL_PATH);$(IPLUG_PATH);$(EXTRAS_PATH);$(EXTRAS_PATH)\OSC;$(EXTRAS_PATH)\Synth;$(EXTRAS_PATH)\WebView;$(JSON_PATH);$(SolutionDir)\resources</IPLUG_INC_PATHS>
1414
<IPLUG_DEPS_PATH>$(DEPS_PATH)\IPlug</IPLUG_DEPS_PATH>
1515
<IGRAPHICS_DEPS_PATH>$(DEPS_PATH)\IGraphics</IGRAPHICS_DEPS_PATH>
1616
<NANOVG_PATH>$(IGRAPHICS_DEPS_PATH)\NanoVG\src</NANOVG_PATH>
@@ -23,12 +23,10 @@
2323
<PNG_PATH>$(WDL_PATH)\libpng</PNG_PATH>
2424
<ZLIB_PATH>$(WDL_PATH)\zlib</ZLIB_PATH>
2525
<STB_PATH>$(IGRAPHICS_DEPS_PATH)\STB</STB_PATH>
26-
<FAUST_INC_PATHS>$(DEPS_PATH)\Build\win\Faust\include</FAUST_INC_PATHS>
2726
<STATIC_LIBS_PATH>$(DEPS_PATH)\Build\win\$(Platform)\$(Configuration)</STATIC_LIBS_PATH>
2827
<ICUDAT_PATH>$(DEPS_PATH)\Build\win\bin\icudtl.dat</ICUDAT_PATH>
29-
<IMGUI_INC_PATHS>$(IGRAPHICS_DEPS_PATH)\imgui;$(IGRAPHICS_DEPS_PATH)\imgui\backends</IMGUI_INC_PATHS>
3028
<YOGA_INC_PATHS>$(IGRAPHICS_DEPS_PATH)\yoga;$(IGRAPHICS_DEPS_PATH)\yoga\yoga</YOGA_INC_PATHS>
31-
<IGRAPHICS_INC_PATHS>$(IGRAPHICS_PATH);$(IGRAPHICS_PATH)\Controls;$(IGRAPHICS_PATH)\Drawing;$(IGRAPHICS_PATH)\Platforms;$(IGRAPHICS_PATH)\Extras;$(NANOSVG_PATH);$(NANOVG_PATH);$(PNG_PATH);$(ZLIB_PATH);$(FREETYPE_PATH);$(STB_PATH);$(IMGUI_INC_PATHS);$(SKIA_INC_PATHS);$(YOGA_INC_PATHS)</IGRAPHICS_INC_PATHS>
29+
<IGRAPHICS_INC_PATHS>$(IGRAPHICS_PATH);$(IGRAPHICS_PATH)\Controls;$(IGRAPHICS_PATH)\Drawing;$(IGRAPHICS_PATH)\Platforms;$(IGRAPHICS_PATH)\Extras;$(NANOSVG_PATH);$(NANOVG_PATH);$(PNG_PATH);$(ZLIB_PATH);$(FREETYPE_PATH);$(STB_PATH);$(SKIA_INC_PATHS);$(YOGA_INC_PATHS)</IGRAPHICS_INC_PATHS>
3230
<CLAP_SDK Condition="'$(CLAP_SDK)'==''">$(IPLUG_DEPS_PATH)\CLAP_SDK\include</CLAP_SDK>
3331
<CLAP_HELPERS Condition="'$(CLAP_HELPERS)'==''">$(IPLUG_DEPS_PATH)\CLAP_HELPERS\include\clap\helpers</CLAP_HELPERS>
3432
<VST2_SDK Condition="'$(VST2_SDK)'==''">$(IPLUG_DEPS_PATH)\VST2_SDK</VST2_SDK>
@@ -75,7 +73,6 @@
7573
<REAPER_INC_PATHS>$(IPLUG_DEPS_PATH)/Reaper;$(IPLUG_PATH)\ReaperExt;</REAPER_INC_PATHS>
7674
<AAX_ICON>$(AAX_SDK)\Utilities\PlugIn.ico</AAX_ICON>
7775
<VST_ICON>$(IPLUG2_ROOT)\Scripts\icons\VST_Logo_Steinberg.ico</VST_ICON>
78-
<FAUST_LIB_PATH>$(DEPS_PATH)\Build\win\Faust\lib</FAUST_LIB_PATH>
7976
</PropertyGroup>
8077
<PropertyGroup>
8178
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -94,7 +91,7 @@
9491
</ItemDefinitionGroup>
9592
<Link>
9693
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
97-
<AdditionalLibraryDirectories>$(STATIC_LIBS_PATH);$(AAX_SDK)\Libs\$(Configuration);$(FAUST_LIB_PATH);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
94+
<AdditionalLibraryDirectories>$(STATIC_LIBS_PATH);$(AAX_SDK)\Libs\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9895
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
9996
</Link>
10097
<Lib>
@@ -165,18 +162,12 @@
165162
<BuildMacro Include="STB_PATH">
166163
<Value>$(STB_PATH)</Value>
167164
</BuildMacro>
168-
<BuildMacro Include="FAUST_INC_PATHS">
169-
<Value>$(FAUST_INC_PATHS)</Value>
170-
</BuildMacro>
171165
<BuildMacro Include="STATIC_LIBS_PATH">
172166
<Value>$(STATIC_LIBS_PATH)</Value>
173167
</BuildMacro>
174168
<BuildMacro Include="ICUDAT_PATH">
175169
<Value>$(ICUDAT_PATH)</Value>
176170
</BuildMacro>
177-
<BuildMacro Include="IMGUI_INC_PATHS">
178-
<Value>$(IMGUI_INC_PATHS)</Value>
179-
</BuildMacro>
180171
<BuildMacro Include="YOGA_INC_PATHS">
181172
<Value>$(YOGA_INC_PATHS)</Value>
182173
</BuildMacro>
@@ -318,9 +309,6 @@
318309
<BuildMacro Include="VST_ICON">
319310
<Value>$(VST_ICON)</Value>
320311
</BuildMacro>
321-
<BuildMacro Include="FAUST_LIB_PATH">
322-
<Value>$(FAUST_LIB_PATH)</Value>
323-
</BuildMacro>
324312
<BuildMacro Include="CLAP_PATH">
325313
<Value>$(CLAP_PATH)</Value>
326314
</BuildMacro>

0 commit comments

Comments
 (0)