Skip to content

Commit c47c422

Browse files
andrewfbandrewfb
committed
Remove AntTweakBar from build systems
1 parent e46cf60 commit c47c422

File tree

9 files changed

+21
-334
lines changed

9 files changed

+21
-334
lines changed

‎proj/cmake/configure.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ option( CINDER_VERBOSE "Print verbose build configuration messages. " OFF )
55
option( BUILD_SHARED_LIBS "Build Cinder as a shared library. " OFF )
66
option( CINDER_DISABLE_AUDIO "Build Cinder without audio support. " OFF )
77
option( CINDER_DISABLE_VIDEO "Build Cinder without video support. " OFF )
8-
option( CINDER_DISABLE_ANTTWEAKBAR "Build Cinder without AntTweakBar support. " OFF )
98
option( CINDER_DISABLE_IMGUI "Build Cinder without imgui support. " OFF )
109

1110
include( ${CMAKE_CURRENT_LIST_DIR}/utilities.cmake )

‎proj/cmake/libcinder_configure.cmake‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ endif()
5151
list( APPEND CINDER_INCLUDE_SYSTEM_PRIVATE
5252
${CINDER_INC_DIR}
5353
${CINDER_INC_DIR}/oggvorbis
54-
${CINDER_SRC_DIR}/AntTweakBar
5554
)
5655

5756
# find cross-platform packages
@@ -80,13 +79,6 @@ else()
8079
list( APPEND CINDER_DEFINES "-DFT2_BUILD_LIBRARY;-DFT_DEBUG_LEVEL_TRACE" )
8180
endif()
8281

83-
# declare whether AntTweakBar is available (isn't on mobile devices)
84-
if( CINDER_GL_ES OR CINDER_DISABLE_ANTTWEAKBAR )
85-
set( CINDER_ANTTWEAKBAR_ENABLED FALSE )
86-
else()
87-
set( CINDER_ANTTWEAKBAR_ENABLED TRUE )
88-
endif()
89-
9082
if( CINDER_DISABLE_IMGUI )
9183
set( CINDER_IMGUI_ENABLED FALSE )
9284
else()

‎proj/cmake/libcinder_source_files.cmake‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -288,38 +288,6 @@ if( CINDER_MSW OR PNG_FOUND )
288288
source_group( "cinder" FILES ${CINDER_SRC_DIR}/cinder/ImageSourcePng.cpp )
289289
endif()
290290

291-
# ----------------------------------------------------------------------------------------------------------------------
292-
# cinder::params + AntTweakBar
293-
# ----------------------------------------------------------------------------------------------------------------------
294-
295-
if( CINDER_ANTTWEAKBAR_ENABLED )
296-
297-
list( APPEND SRC_SET_CINDER_PARAMS
298-
${CINDER_SRC_DIR}/cinder/params/Params.cpp
299-
)
300-
301-
list( APPEND SRC_SET_ANTTWEAKBAR
302-
${CINDER_SRC_DIR}/AntTweakBar/TwColors.cpp
303-
${CINDER_SRC_DIR}/AntTweakBar/TwFonts.cpp
304-
${CINDER_SRC_DIR}/AntTweakBar/LoadOGL.cpp
305-
${CINDER_SRC_DIR}/AntTweakBar/LoadOGLCore.cpp
306-
${CINDER_SRC_DIR}/AntTweakBar/TwBar.cpp
307-
${CINDER_SRC_DIR}/AntTweakBar/TwMgr.cpp
308-
${CINDER_SRC_DIR}/AntTweakBar/TwOpenGL.cpp
309-
${CINDER_SRC_DIR}/AntTweakBar/TwOpenGLCore.cpp
310-
${CINDER_SRC_DIR}/AntTweakBar/TwPrecomp.cpp
311-
)
312-
313-
list( APPEND CINDER_SRC_FILES
314-
${SRC_SET_CINDER_PARAMS}
315-
${SRC_SET_ANTTWEAKBAR}
316-
)
317-
318-
source_group( "cinder\\params" FILES ${SRC_SET_CINDER_PARAMS} )
319-
source_group( "thirdparty\\AntTweakBar" FILES ${SRC_SET_ANTTWEAKBAR} )
320-
321-
endif()
322-
323291
if( CINDER_IMGUI_ENABLED )
324292
list( APPEND SRC_SET_CINDER_IMGUI ${CINDER_SRC_DIR}/cinder/CinderImGui.cpp )
325293
if( CINDER_IMGUI_DIR )

‎proj/cmake/platform_macosx.cmake‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,6 @@ if( NOT CINDER_DISABLE_VIDEO )
7272
list( APPEND CINDER_SOURCES_OBJCPP ${CINDER_SRC_DIR}/cinder/qtime/QuickTimeGlImplAvf.cpp )
7373
endif()
7474

75-
if( NOT CINDER_DISABLE_ANTTWEAKBAR )
76-
list( APPEND CINDER_SOURCES_OBJCPP
77-
${CINDER_SRC_DIR}/AntTweakBar/TwColors.cpp
78-
${CINDER_SRC_DIR}/AntTweakBar/TwFonts.cpp
79-
${CINDER_SRC_DIR}/AntTweakBar/LoadOGL.cpp
80-
${CINDER_SRC_DIR}/AntTweakBar/LoadOGLCore.cpp
81-
${CINDER_SRC_DIR}/AntTweakBar/TwBar.cpp
82-
${CINDER_SRC_DIR}/AntTweakBar/TwMgr.cpp
83-
${CINDER_SRC_DIR}/AntTweakBar/TwOpenGl.cpp
84-
${CINDER_SRC_DIR}/AntTweakBar/TwOpenGLCore.cpp
85-
${CINDER_SRC_DIR}/AntTweakBar/TwPrecomp.cpp
86-
)
87-
endif()
88-
89-
9075
set_source_files_properties( ${CINDER_SOURCES_OBJCPP}
9176
PROPERTIES COMPILE_FLAGS "-x objective-c++"
9277
)
@@ -172,5 +157,4 @@ endif()
172157
list( APPEND CINDER_SKIP_SAMPLES
173158
_opengl/ParticleSphereCS
174159
_opengl/NVidiaComputeParticles
175-
)
176-
160+
)

‎proj/cmake/platform_msw.cmake‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ list( APPEND SRC_SET_MSW
1313
${CINDER_SRC_DIR}/glad/glad_wgl.c
1414
)
1515

16-
if( NOT CINDER_DISABLE_ANTTWEAKBAR )
17-
list( APPEND SRC_SET_MSW ${CINDER_SRC_DIR}/AntTweakBar/TwDirect3D11.cpp )
18-
endif()
19-
2016
list( APPEND SRC_SET_APP_MSW
2117
# TODO: should these two files be added to "cinder\\app" group?
2218
${CINDER_SRC_DIR}/cinder/app/AppScreenSaver.cpp

‎proj/vc2015_winrt/cinder.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,7 +1115,7 @@
11151115
<CompileAsWinRT>true</CompileAsWinRT>
11161116
<SDLCheck>true</SDLCheck>
11171117
<PreprocessorDefinitions>CINDER_GL_ANGLE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1118-
<AdditionalIncludeDirectories>..\..\src\AntTweakBar;..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1118+
<AdditionalIncludeDirectories>..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11191119
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
11201120
<ProgramDataBaseFileName>$(ProjectDir)..\..\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset)\cinder.pdb</ProgramDataBaseFileName>
11211121
</ClCompile>
@@ -1134,7 +1134,7 @@
11341134
<CompileAsWinRT>true</CompileAsWinRT>
11351135
<SDLCheck>true</SDLCheck>
11361136
<PreprocessorDefinitions>CINDER_GL_ANGLE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1137-
<AdditionalIncludeDirectories>..\..\src\AntTweakBar;..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1137+
<AdditionalIncludeDirectories>..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11381138
<Optimization>Full</Optimization>
11391139
<ProgramDataBaseFileName>$(ProjectDir)..\..\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset)\cinder.pdb</ProgramDataBaseFileName>
11401140
</ClCompile>
@@ -1153,7 +1153,7 @@
11531153
<CompileAsWinRT>true</CompileAsWinRT>
11541154
<SDLCheck>true</SDLCheck>
11551155
<PreprocessorDefinitions>CINDER_GL_ANGLE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
1156-
<AdditionalIncludeDirectories>..\..\src\AntTweakBar;..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1156+
<AdditionalIncludeDirectories>..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11571157
<ProgramDataBaseFileName>$(ProjectDir)..\..\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset)\cinder.pdb</ProgramDataBaseFileName>
11581158
</ClCompile>
11591159
<Link>
@@ -1171,7 +1171,7 @@
11711171
<CompileAsWinRT>true</CompileAsWinRT>
11721172
<SDLCheck>true</SDLCheck>
11731173
<PreprocessorDefinitions>CINDER_GL_ANGLE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
1174-
<AdditionalIncludeDirectories>..\..\src\AntTweakBar;..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1174+
<AdditionalIncludeDirectories>..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11751175
<Optimization>Full</Optimization>
11761176
<ProgramDataBaseFileName>$(ProjectDir)..\..\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset)\cinder.pdb</ProgramDataBaseFileName>
11771177
</ClCompile>
@@ -1190,7 +1190,7 @@
11901190
<CompileAsWinRT>true</CompileAsWinRT>
11911191
<SDLCheck>true</SDLCheck>
11921192
<PreprocessorDefinitions>CINDER_GL_ANGLE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1193-
<AdditionalIncludeDirectories>..\..\src\AntTweakBar;..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1193+
<AdditionalIncludeDirectories>..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
11941194
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
11951195
<ProgramDataBaseFileName>$(ProjectDir)..\..\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset)\cinder.pdb</ProgramDataBaseFileName>
11961196
</ClCompile>
@@ -1209,7 +1209,7 @@
12091209
<CompileAsWinRT>true</CompileAsWinRT>
12101210
<SDLCheck>true</SDLCheck>
12111211
<PreprocessorDefinitions>CINDER_GL_ANGLE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
1212-
<AdditionalIncludeDirectories>..\..\src\AntTweakBar;..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
1212+
<AdditionalIncludeDirectories>..\..\include\cinder;..\..\include;..\..\src\linebreak;..\..\src\zlib;..\..\include\ANGLE;..\..\src\r8brain;..\..\include\oggvorbis;..\..\include\tinyexr;..\..\include\freetype;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
12131213
<Optimization>Full</Optimization>
12141214
<ProgramDataBaseFileName>$(ProjectDir)..\..\lib\msw\$(PlatformTarget)\$(Configuration)\$(PlatformToolset)\cinder.pdb</ProgramDataBaseFileName>
12151215
</ClCompile>

0 commit comments

Comments
 (0)