From f1fe73d1909a2448a004a88362a1a532d0d4f7c3 Mon Sep 17 00:00:00 2001 From: sanine Date: Sun, 12 Feb 2023 23:53:22 -0600 Subject: switch to tinyobj and nanovg from assimp and cairo --- .../gtest/xcode/Config/DebugProject.xcconfig | 30 ---------------- .../gtest/xcode/Config/FrameworkTarget.xcconfig | 17 --------- .../contrib/gtest/xcode/Config/General.xcconfig | 41 ---------------------- .../gtest/xcode/Config/ReleaseProject.xcconfig | 32 ----------------- .../xcode/Config/StaticLibraryTarget.xcconfig | 18 ---------- .../contrib/gtest/xcode/Config/TestTarget.xcconfig | 8 ----- 6 files changed, 146 deletions(-) delete mode 100644 libs/assimp/contrib/gtest/xcode/Config/DebugProject.xcconfig delete mode 100644 libs/assimp/contrib/gtest/xcode/Config/FrameworkTarget.xcconfig delete mode 100644 libs/assimp/contrib/gtest/xcode/Config/General.xcconfig delete mode 100644 libs/assimp/contrib/gtest/xcode/Config/ReleaseProject.xcconfig delete mode 100644 libs/assimp/contrib/gtest/xcode/Config/StaticLibraryTarget.xcconfig delete mode 100644 libs/assimp/contrib/gtest/xcode/Config/TestTarget.xcconfig (limited to 'libs/assimp/contrib/gtest/xcode/Config') diff --git a/libs/assimp/contrib/gtest/xcode/Config/DebugProject.xcconfig b/libs/assimp/contrib/gtest/xcode/Config/DebugProject.xcconfig deleted file mode 100644 index 3d68157..0000000 --- a/libs/assimp/contrib/gtest/xcode/Config/DebugProject.xcconfig +++ /dev/null @@ -1,30 +0,0 @@ -// -// DebugProject.xcconfig -// -// These are Debug Configuration project settings for the gtest framework and -// examples. It is set in the "Based On:" dropdown in the "Project" info -// dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -#include "General.xcconfig" - -// No optimization -GCC_OPTIMIZATION_LEVEL = 0 - -// Deployment postprocessing is what triggers Xcode to strip, turn it off -DEPLOYMENT_POSTPROCESSING = NO - -// Dead code stripping off -DEAD_CODE_STRIPPING = NO - -// Debug symbols should be on obviously -GCC_GENERATE_DEBUGGING_SYMBOLS = YES - -// Define the DEBUG macro in all debug builds -OTHER_CFLAGS = $(OTHER_CFLAGS) -DDEBUG=1 - -// These are turned off to avoid STL incompatibilities with client code -// // Turns on special C++ STL checks to "encourage" good STL use -// GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_DEBUG _GLIBCPP_CONCEPT_CHECKS diff --git a/libs/assimp/contrib/gtest/xcode/Config/FrameworkTarget.xcconfig b/libs/assimp/contrib/gtest/xcode/Config/FrameworkTarget.xcconfig deleted file mode 100644 index 357b1c8..0000000 --- a/libs/assimp/contrib/gtest/xcode/Config/FrameworkTarget.xcconfig +++ /dev/null @@ -1,17 +0,0 @@ -// -// FrameworkTarget.xcconfig -// -// These are Framework target settings for the gtest framework and examples. It -// is set in the "Based On:" dropdown in the "Target" info dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -// Dynamic libs need to be position independent -GCC_DYNAMIC_NO_PIC = NO - -// Dynamic libs should not have their external symbols stripped. -STRIP_STYLE = non-global - -// Let the user install by specifying the $DSTROOT with xcodebuild -SKIP_INSTALL = NO diff --git a/libs/assimp/contrib/gtest/xcode/Config/General.xcconfig b/libs/assimp/contrib/gtest/xcode/Config/General.xcconfig deleted file mode 100644 index f23e322..0000000 --- a/libs/assimp/contrib/gtest/xcode/Config/General.xcconfig +++ /dev/null @@ -1,41 +0,0 @@ -// -// General.xcconfig -// -// These are General configuration settings for the gtest framework and -// examples. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -// Build for PPC and Intel, 32- and 64-bit -ARCHS = i386 x86_64 ppc ppc64 - -// Zerolink prevents link warnings so turn it off -ZERO_LINK = NO - -// Prebinding considered unhelpful in 10.3 and later -PREBINDING = NO - -// Strictest warning policy -WARNING_CFLAGS = -Wall -Werror -Wendif-labels -Wnewline-eof -Wno-sign-compare -Wshadow - -// Work around Xcode bugs by using external strip. See: -// http://lists.apple.com/archives/Xcode-users/2006/Feb/msg00050.html -SEPARATE_STRIP = YES - -// Force C99 dialect -GCC_C_LANGUAGE_STANDARD = c99 - -// not sure why apple defaults this on, but it's pretty risky -ALWAYS_SEARCH_USER_PATHS = NO - -// Turn on position dependent code for most cases (overridden where appropriate) -GCC_DYNAMIC_NO_PIC = YES - -// Default SDK and minimum OS version is 10.4 -SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk -MACOSX_DEPLOYMENT_TARGET = 10.4 -GCC_VERSION = 4.0 - -// VERSIONING BUILD SETTINGS (used in Info.plist) -GTEST_VERSIONINFO_ABOUT = © 2008 Google Inc. diff --git a/libs/assimp/contrib/gtest/xcode/Config/ReleaseProject.xcconfig b/libs/assimp/contrib/gtest/xcode/Config/ReleaseProject.xcconfig deleted file mode 100644 index 5349f0a..0000000 --- a/libs/assimp/contrib/gtest/xcode/Config/ReleaseProject.xcconfig +++ /dev/null @@ -1,32 +0,0 @@ -// -// ReleaseProject.xcconfig -// -// These are Release Configuration project settings for the gtest framework -// and examples. It is set in the "Based On:" dropdown in the "Project" info -// dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -#include "General.xcconfig" - -// subconfig/Release.xcconfig - -// Optimize for space and size (Apple recommendation) -GCC_OPTIMIZATION_LEVEL = s - -// Deploment postprocessing is what triggers Xcode to strip -DEPLOYMENT_POSTPROCESSING = YES - -// No symbols -GCC_GENERATE_DEBUGGING_SYMBOLS = NO - -// Dead code strip does not affect ObjC code but can help for C -DEAD_CODE_STRIPPING = YES - -// NDEBUG is used by things like assert.h, so define it for general compat. -// ASSERT going away in release tends to create unused vars. -OTHER_CFLAGS = $(OTHER_CFLAGS) -DNDEBUG=1 -Wno-unused-variable - -// When we strip we want to strip all symbols in release, but save externals. -STRIP_STYLE = all diff --git a/libs/assimp/contrib/gtest/xcode/Config/StaticLibraryTarget.xcconfig b/libs/assimp/contrib/gtest/xcode/Config/StaticLibraryTarget.xcconfig deleted file mode 100644 index 3922fa5..0000000 --- a/libs/assimp/contrib/gtest/xcode/Config/StaticLibraryTarget.xcconfig +++ /dev/null @@ -1,18 +0,0 @@ -// -// StaticLibraryTarget.xcconfig -// -// These are static library target settings for libgtest.a. It -// is set in the "Based On:" dropdown in the "Target" info dialog. -// This file is based on the Xcode Configuration files in: -// http://code.google.com/p/google-toolbox-for-mac/ -// - -// Static libs can be included in bundles so make them position independent -GCC_DYNAMIC_NO_PIC = NO - -// Static libs should not have their internal globals or external symbols -// stripped. -STRIP_STYLE = debugging - -// Let the user install by specifying the $DSTROOT with xcodebuild -SKIP_INSTALL = NO diff --git a/libs/assimp/contrib/gtest/xcode/Config/TestTarget.xcconfig b/libs/assimp/contrib/gtest/xcode/Config/TestTarget.xcconfig deleted file mode 100644 index e6652ba..0000000 --- a/libs/assimp/contrib/gtest/xcode/Config/TestTarget.xcconfig +++ /dev/null @@ -1,8 +0,0 @@ -// -// TestTarget.xcconfig -// -// These are Test target settings for the gtest framework and examples. It -// is set in the "Based On:" dropdown in the "Target" info dialog. - -PRODUCT_NAME = $(TARGET_NAME) -HEADER_SEARCH_PATHS = ../include -- cgit v1.2.1