diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2cded92 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +.vs/ +/bin +/lib +/ext/libogg/build +/ext/tinyxml/build +/ext/tremor/build +/src/ck/build +/src/cktool/build diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..f9677a9 --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,17 @@ +{ + "configurations": [ + { + "name": "Linux", + "includePath": [ + "${workspaceFolder}/**" + ], + "defines": [], + "compilerPath": "/usr/bin/clang", + "cStandard": "c17", + "cppStandard": "c++14", + "intelliSenseMode": "linux-clang-x64", + "compileCommands": "mesonbuild/debug/linux/compile_commands.json" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..fe91fc7 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,23 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "Build", + "type": "shell", + "command": "ninja", + "problemMatcher": { + "base": "$gcc", + "fileLocation": ["relative", "${workspaceFolder}/mesonbuild/debug/linux"] + }, + "group": { + "kind": "build", + "isDefault": true + }, + "options": { + "cwd": "${workspaceFolder}/mesonbuild/debug/linux" + } + } + ] +} diff --git a/Cricket.code-workspace b/Cricket.code-workspace new file mode 100644 index 0000000..510d317 --- /dev/null +++ b/Cricket.code-workspace @@ -0,0 +1,19 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "mesonbuild.configureOnOpen": true, + "mesonbuild.buildFolder": "mesonbuild/debug/linux", + "mesonbuild.configureOptions": [ + "--native-file=meson.clang.cfg" + ], + "files.associations": { + "os_types.h": "c", + "alloca.h": "c", + "memory.h": "c" + } + } +} diff --git a/build/Makefile-common b/build/Makefile-common index 3623596..dabe558 100644 --- a/build/Makefile-common +++ b/build/Makefile-common @@ -91,16 +91,16 @@ ifeq ($(CK_TARGET_OS),android) endif else ifeq ($(CK_TARGET_OS),linux) ifeq ($(CK_ARCH),x86) - C_ARCH_FLAGS := -m32 + C_ARCH_FLAGS := -m32 -msse3 -mfpmath=sse else ifeq ($(CK_ARCH),x64) - C_ARCH_FLAGS := -m64 + C_ARCH_FLAGS := -m64 -msse3 -mfpmath=sse endif else $(error unknown target OS!) endif -C_DEBUG_FLAGS := -O0 -Os -DCK_DEBUG=1 +C_DEBUG_FLAGS := -O0 -DCK_DEBUG=1 C_RELEASE_FLAGS := -O2 -Os -fomit-frame-pointer -DCK_NDEBUG=1 -DNDEBUG ifeq ($(CK_CONFIG),debug) C_FLAGS := $(C_COMMON_FLAGS) $(C_ARCH_FLAGS) $(C_DEBUG_FLAGS) diff --git a/build/macosx/combine_binary.sh b/build/macosx/combine_binary.sh index c80c97b..82c31bf 100644 --- a/build/macosx/combine_binary.sh +++ b/build/macosx/combine_binary.sh @@ -18,8 +18,8 @@ fi if [ ! -e $outfile ] then - echo lipo $infile -create -arch_blank $otherarch -output $outfile - lipo $infile -create -arch_blank $otherarch -output $outfile + echo lipo $infile -create -output $outfile + lipo $infile -create -output $outfile else echo lipo $outfile -replace $ARCHS $infile -output $outfile lipo $outfile -replace $ARCHS $infile -output $outfile diff --git a/ext/libogg/ogg_osx.xcodeproj/project.pbxproj b/ext/libogg/ogg_osx.xcodeproj/project.pbxproj index 13b4d25..e575306 100644 --- a/ext/libogg/ogg_osx.xcodeproj/project.pbxproj +++ b/ext/libogg/ogg_osx.xcodeproj/project.pbxproj @@ -89,14 +89,15 @@ AAC6ACC014ED71920055966A /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1420; }; buildConfigurationList = AAC6ACC314ED71920055966A /* Build configuration list for PBXProject "ogg_osx" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = AAC6ACBE14ED71920055966A; productRefGroup = AAC6ACCA14ED71920055966A /* Products */; @@ -125,6 +126,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -137,12 +139,14 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -163,7 +167,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; ONLY_ACTIVE_ARCH = YES; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; SDKROOT = macosx; @@ -174,6 +178,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -186,12 +191,14 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -205,7 +212,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; SDKROOT = macosx; }; @@ -216,8 +223,10 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; EXECUTABLE_PREFIX = lib; HEADER_SEARCH_PATHS = include; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -227,8 +236,10 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; EXECUTABLE_PREFIX = lib; HEADER_SEARCH_PATHS = include; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/ext/libogg/ogg_win_vs2017.vcxproj b/ext/libogg/ogg_win_vs2017.vcxproj index b32df2b..b78897b 100755 --- a/ext/libogg/ogg_win_vs2017.vcxproj +++ b/ext/libogg/ogg_win_vs2017.vcxproj @@ -43,7 +43,7 @@ Win32Proj ogg ogg - 10.0.15063.0 + 10.0.17134.0 @@ -166,7 +166,7 @@ Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) include - MultiThreadedDebug + MultiThreadedDebugDLL Windows @@ -226,7 +226,7 @@ true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) include - MultiThreaded + MultiThreadedDLL Windows diff --git a/ext/libogg/ogg_win_vs2022.vcxproj b/ext/libogg/ogg_win_vs2022.vcxproj new file mode 100644 index 0000000..4c893fb --- /dev/null +++ b/ext/libogg/ogg_win_vs2022.vcxproj @@ -0,0 +1,316 @@ + + + + + DebugDynamic + Win32 + + + DebugDynamic + x64 + + + DebugStatic + Win32 + + + DebugStatic + x64 + + + ReleaseDynamic + Win32 + + + ReleaseDynamic + x64 + + + ReleaseStatic + Win32 + + + ReleaseStatic + x64 + + + + + + + + {EDB53074-8394-4DC9-8D68-21C232CFE3A5} + Win32Proj + ogg + ogg + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + false + true + Unicode + v143 + + + StaticLibrary + false + true + Unicode + v143 + + + StaticLibrary + false + true + Unicode + v143 + + + StaticLibrary + false + true + Unicode + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + include + MultiThreadedDebugDLL + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + include + MultiThreadedDebug + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + include + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + include + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + include + MultiThreadedDLL + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + include + MultiThreaded + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + include + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + include + + + Windows + true + true + true + + + + + include + + + + + include + + + + + include + + + + + include + + + + + + \ No newline at end of file diff --git a/ext/libogg/ogg_win_vs2022.vcxproj.user b/ext/libogg/ogg_win_vs2022.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/ext/libogg/ogg_win_vs2022.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ext/tinyxml/tinyxml_osx.xcodeproj/project.pbxproj b/ext/tinyxml/tinyxml_osx.xcodeproj/project.pbxproj index 5ef845f..5deb718 100644 --- a/ext/tinyxml/tinyxml_osx.xcodeproj/project.pbxproj +++ b/ext/tinyxml/tinyxml_osx.xcodeproj/project.pbxproj @@ -129,14 +129,15 @@ AA6CF5AD13D539F600F62989 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1420; }; buildConfigurationList = AA6CF5B013D539F600F62989 /* Build configuration list for PBXProject "tinyxml_osx" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = AA6CF5AB13D539F600F62989; productRefGroup = AA6CF5B713D539F600F62989 /* Products */; @@ -166,6 +167,7 @@ AA6CF5C213D539F600F62989 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -178,11 +180,13 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -197,7 +201,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -206,6 +210,7 @@ AA6CF5C313D539F600F62989 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -218,11 +223,13 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; @@ -233,7 +240,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; SDKROOT = macosx; }; name = Release; @@ -245,9 +252,11 @@ CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -259,9 +268,11 @@ CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/ext/tinyxml/tinyxml_win_vs2017.vcxproj b/ext/tinyxml/tinyxml_win_vs2017.vcxproj index c74b8b5..fe5b338 100755 --- a/ext/tinyxml/tinyxml_win_vs2017.vcxproj +++ b/ext/tinyxml/tinyxml_win_vs2017.vcxproj @@ -39,7 +39,7 @@ Win32Proj tinyxml tinyxml - 10.0.15063.0 + 10.0.17134.0 @@ -227,7 +227,8 @@ Level3 WIN32;NDEBUG;%(PreprocessorDefinitions) NotUsing - MultiThreaded + MultiThreadedDLL + true true @@ -241,6 +242,7 @@ WIN32;NDEBUG;%(PreprocessorDefinitions) NotUsing MultiThreadedDLL + true true diff --git a/ext/tinyxml/tinyxml_win_vs2022.vcxproj b/ext/tinyxml/tinyxml_win_vs2022.vcxproj new file mode 100644 index 0000000..d67ec02 --- /dev/null +++ b/ext/tinyxml/tinyxml_win_vs2022.vcxproj @@ -0,0 +1,297 @@ + + + + + DebugDynamic + Win32 + + + DebugDynamic + x64 + + + DebugStatic + Win32 + + + DebugStatic + x64 + + + ReleaseDynamic + Win32 + + + ReleaseDynamic + x64 + + + ReleaseStatic + Win32 + + + ReleaseStatic + x64 + + + + {C7360949-D085-46DE-8A6B-D89A443DEB15} + Win32Proj + tinyxml + tinyxml + 10.0 + + + + StaticLibrary + true + false + Unicode + v143 + + + StaticLibrary + true + false + Unicode + v143 + + + StaticLibrary + true + false + Unicode + v143 + + + StaticLibrary + true + false + Unicode + v143 + + + StaticLibrary + false + false + Unicode + v143 + + + StaticLibrary + false + false + Unicode + v143 + + + StaticLibrary + false + false + Unicode + v143 + + + StaticLibrary + false + false + Unicode + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)\build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + true + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)\build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + true + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)\build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + true + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)\build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + false + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)\build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + false + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)\build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + false + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)\build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + false + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)\build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + NotUsing + MultiThreadedDebug + + + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + NotUsing + MultiThreadedDebugDLL + + + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + NotUsing + MultiThreadedDebug + + + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + NotUsing + MultiThreadedDebugDLL + + + true + + + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + NotUsing + MultiThreadedDLL + true + + + true + + + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + NotUsing + MultiThreadedDLL + true + + + true + + + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + NotUsing + MultiThreaded + + + true + + + + + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + NotUsing + MultiThreadedDLL + + + true + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ext/tinyxml/tinyxml_win_vs2022.vcxproj.user b/ext/tinyxml/tinyxml_win_vs2022.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/ext/tinyxml/tinyxml_win_vs2022.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/ext/tremor/tremor_osx.xcodeproj/project.pbxproj b/ext/tremor/tremor_osx.xcodeproj/project.pbxproj index 5ad0c0e..266e881 100644 --- a/ext/tremor/tremor_osx.xcodeproj/project.pbxproj +++ b/ext/tremor/tremor_osx.xcodeproj/project.pbxproj @@ -122,14 +122,15 @@ AA2D18BB14F58D5B00E946FB /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1420; }; buildConfigurationList = AA2D18BE14F58D5B00E946FB /* Build configuration list for PBXProject "tremor_osx" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = AA2D18B914F58D5B00E946FB; productRefGroup = AA2D18C514F58D5B00E946FB /* Products */; @@ -169,6 +170,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -181,12 +183,14 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -207,7 +211,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-Wno-duplicate-decl-specifier"; SDKROOT = macosx; @@ -218,6 +222,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -230,12 +235,14 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -249,7 +256,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; OTHER_CFLAGS = "-Wno-duplicate-decl-specifier"; SDKROOT = macosx; }; @@ -260,11 +267,13 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; EXECUTABLE_PREFIX = lib; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = ../libogg/include; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -274,11 +283,13 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; EXECUTABLE_PREFIX = lib; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_UNUSED_VARIABLE = NO; HEADER_SEARCH_PATHS = ../libogg/include; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/ext/tremor/tremor_win_vs2017.vcxproj b/ext/tremor/tremor_win_vs2017.vcxproj index d274012..7a188e4 100755 --- a/ext/tremor/tremor_win_vs2017.vcxproj +++ b/ext/tremor/tremor_win_vs2017.vcxproj @@ -54,7 +54,7 @@ Win32Proj tremor tremor - 10.0.15063.0 + 10.0.17134.0 @@ -206,7 +206,7 @@ Level3 Disabled WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL ../libogg/include 4244;4114;4996;4101;4005 @@ -240,7 +240,7 @@ true true WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL ../libogg/include 4244;4114;4996;4101;4005 diff --git a/ext/tremor/tremor_win_vs2022.vcxproj b/ext/tremor/tremor_win_vs2022.vcxproj new file mode 100644 index 0000000..b099334 --- /dev/null +++ b/ext/tremor/tremor_win_vs2022.vcxproj @@ -0,0 +1,315 @@ + + + + + DebugDynamic + Win32 + + + DebugDynamic + x64 + + + DebugStatic + Win32 + + + DebugStatic + x64 + + + ReleaseDynamic + Win32 + + + ReleaseDynamic + x64 + + + ReleaseStatic + Win32 + + + ReleaseStatic + x64 + + + + + + + + + + + + + + + + + + + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76} + Win32Proj + tremor + tremor + 10.0 + + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + true + Unicode + v143 + + + StaticLibrary + false + true + Unicode + v143 + + + StaticLibrary + false + true + Unicode + v143 + + + StaticLibrary + false + true + Unicode + v143 + + + StaticLibrary + false + true + Unicode + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ../libogg/include + 4244;4114;4996;4101;4005 + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + ../libogg/include + 4244;4114;4996;4101;4005 + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + ../libogg/include + 4244;4114;4996;4101;4005 + + + Windows + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDebug + ../libogg/include + 4244;4114;4996;4101;4005 + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreadedDLL + ../libogg/include + 4244;4114;4996;4101;4005 + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + ../libogg/include + 4244;4114;4996;4101;4005 + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ../libogg/include + 4244;4114;4996;4101;4005 + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + ../libogg/include + 4244;4114;4996;4101;4005 + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/ext/tremor/tremor_win_vs2022.vcxproj.user b/ext/tremor/tremor_win_vs2022.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/ext/tremor/tremor_win_vs2022.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/lib/android/ndk/arm64-v8a/debug/libck.a b/lib/android/ndk/arm64-v8a/debug/libck.a deleted file mode 100644 index 38663c5..0000000 Binary files a/lib/android/ndk/arm64-v8a/debug/libck.a and /dev/null differ diff --git a/lib/android/ndk/arm64-v8a/release/libck.a b/lib/android/ndk/arm64-v8a/release/libck.a deleted file mode 100644 index e03ab59..0000000 Binary files a/lib/android/ndk/arm64-v8a/release/libck.a and /dev/null differ diff --git a/lib/android/ndk/armeabi-v7a/debug/libck.a b/lib/android/ndk/armeabi-v7a/debug/libck.a deleted file mode 100644 index 8e43ca9..0000000 Binary files a/lib/android/ndk/armeabi-v7a/debug/libck.a and /dev/null differ diff --git a/lib/android/ndk/armeabi-v7a/release/libck.a b/lib/android/ndk/armeabi-v7a/release/libck.a deleted file mode 100644 index f1b0827..0000000 Binary files a/lib/android/ndk/armeabi-v7a/release/libck.a and /dev/null differ diff --git a/lib/android/ndk/x86/debug/libck.a b/lib/android/ndk/x86/debug/libck.a deleted file mode 100644 index e17e448..0000000 Binary files a/lib/android/ndk/x86/debug/libck.a and /dev/null differ diff --git a/lib/android/ndk/x86/release/libck.a b/lib/android/ndk/x86/release/libck.a deleted file mode 100644 index 73e0edf..0000000 Binary files a/lib/android/ndk/x86/release/libck.a and /dev/null differ diff --git a/lib/android/ndk/x86_64/debug/libck.a b/lib/android/ndk/x86_64/debug/libck.a deleted file mode 100644 index 8b26c2d..0000000 Binary files a/lib/android/ndk/x86_64/debug/libck.a and /dev/null differ diff --git a/lib/android/ndk/x86_64/release/libck.a b/lib/android/ndk/x86_64/release/libck.a deleted file mode 100644 index 058fc1d..0000000 Binary files a/lib/android/ndk/x86_64/release/libck.a and /dev/null differ diff --git a/lib/android/sdk/debug/ck.aar b/lib/android/sdk/debug/ck.aar deleted file mode 100644 index 1098f62..0000000 Binary files a/lib/android/sdk/debug/ck.aar and /dev/null differ diff --git a/lib/android/sdk/release/ck.aar b/lib/android/sdk/release/ck.aar deleted file mode 100644 index acfb21e..0000000 Binary files a/lib/android/sdk/release/ck.aar and /dev/null differ diff --git a/lib/ios/Debug/libck.a b/lib/ios/Debug/libck.a deleted file mode 100644 index 54699ba..0000000 Binary files a/lib/ios/Debug/libck.a and /dev/null differ diff --git a/lib/linux/x64/debug/libck.a b/lib/linux/x64/debug/libck.a deleted file mode 100644 index 9ed5550..0000000 Binary files a/lib/linux/x64/debug/libck.a and /dev/null differ diff --git a/lib/linux/x64/release/libck.a b/lib/linux/x64/release/libck.a deleted file mode 100644 index fdc606d..0000000 Binary files a/lib/linux/x64/release/libck.a and /dev/null differ diff --git a/lib/linux/x86/debug/libck.a b/lib/linux/x86/debug/libck.a deleted file mode 100644 index 523fe73..0000000 Binary files a/lib/linux/x86/debug/libck.a and /dev/null differ diff --git a/lib/linux/x86/release/libck.a b/lib/linux/x86/release/libck.a deleted file mode 100644 index 94eee4e..0000000 Binary files a/lib/linux/x86/release/libck.a and /dev/null differ diff --git a/lib/macosx/Debug/libck.a b/lib/macosx/Debug/libck.a deleted file mode 100644 index e3cdd28..0000000 Binary files a/lib/macosx/Debug/libck.a and /dev/null differ diff --git a/lib/macosx/Release/libck.a b/lib/macosx/Release/libck.a deleted file mode 100644 index d2056c5..0000000 Binary files a/lib/macosx/Release/libck.a and /dev/null differ diff --git a/lib/tvos/Debug/libck.a b/lib/tvos/Debug/libck.a deleted file mode 100644 index 65f0a5a..0000000 Binary files a/lib/tvos/Debug/libck.a and /dev/null differ diff --git a/lib/tvos/Release/libck.a b/lib/tvos/Release/libck.a deleted file mode 100644 index 8b46a99..0000000 Binary files a/lib/tvos/Release/libck.a and /dev/null differ diff --git a/lib/win/vs12.0/x64/DebugDynamic/ck.lib b/lib/win/vs12.0/x64/DebugDynamic/ck.lib deleted file mode 100755 index 815a084..0000000 Binary files a/lib/win/vs12.0/x64/DebugDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs12.0/x64/DebugDynamic/ck.pdb b/lib/win/vs12.0/x64/DebugDynamic/ck.pdb deleted file mode 100755 index f81469b..0000000 Binary files a/lib/win/vs12.0/x64/DebugDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs12.0/x64/DebugStatic/ck.lib b/lib/win/vs12.0/x64/DebugStatic/ck.lib deleted file mode 100755 index a0cc560..0000000 Binary files a/lib/win/vs12.0/x64/DebugStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs12.0/x64/DebugStatic/ck.pdb b/lib/win/vs12.0/x64/DebugStatic/ck.pdb deleted file mode 100755 index bf9ddd8..0000000 Binary files a/lib/win/vs12.0/x64/DebugStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs12.0/x64/ReleaseDynamic/ck.lib b/lib/win/vs12.0/x64/ReleaseDynamic/ck.lib deleted file mode 100755 index 99fdd64..0000000 Binary files a/lib/win/vs12.0/x64/ReleaseDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs12.0/x64/ReleaseDynamic/ck.pdb b/lib/win/vs12.0/x64/ReleaseDynamic/ck.pdb deleted file mode 100755 index b880510..0000000 Binary files a/lib/win/vs12.0/x64/ReleaseDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs12.0/x64/ReleaseStatic/ck.lib b/lib/win/vs12.0/x64/ReleaseStatic/ck.lib deleted file mode 100755 index ef55fe9..0000000 Binary files a/lib/win/vs12.0/x64/ReleaseStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs12.0/x64/ReleaseStatic/ck.pdb b/lib/win/vs12.0/x64/ReleaseStatic/ck.pdb deleted file mode 100755 index 4bf6b3d..0000000 Binary files a/lib/win/vs12.0/x64/ReleaseStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs12.0/x86/DebugDynamic/ck.lib b/lib/win/vs12.0/x86/DebugDynamic/ck.lib deleted file mode 100755 index 5781880..0000000 Binary files a/lib/win/vs12.0/x86/DebugDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs12.0/x86/DebugDynamic/ck.pdb b/lib/win/vs12.0/x86/DebugDynamic/ck.pdb deleted file mode 100755 index 3453296..0000000 Binary files a/lib/win/vs12.0/x86/DebugDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs12.0/x86/DebugStatic/ck.lib b/lib/win/vs12.0/x86/DebugStatic/ck.lib deleted file mode 100755 index 6ebb47b..0000000 Binary files a/lib/win/vs12.0/x86/DebugStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs12.0/x86/DebugStatic/ck.pdb b/lib/win/vs12.0/x86/DebugStatic/ck.pdb deleted file mode 100755 index cfde3ca..0000000 Binary files a/lib/win/vs12.0/x86/DebugStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs12.0/x86/ReleaseDynamic/ck.lib b/lib/win/vs12.0/x86/ReleaseDynamic/ck.lib deleted file mode 100755 index ad9ece4..0000000 Binary files a/lib/win/vs12.0/x86/ReleaseDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs12.0/x86/ReleaseDynamic/ck.pdb b/lib/win/vs12.0/x86/ReleaseDynamic/ck.pdb deleted file mode 100755 index ba60e7a..0000000 Binary files a/lib/win/vs12.0/x86/ReleaseDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs12.0/x86/ReleaseStatic/ck.lib b/lib/win/vs12.0/x86/ReleaseStatic/ck.lib deleted file mode 100755 index 2958227..0000000 Binary files a/lib/win/vs12.0/x86/ReleaseStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs12.0/x86/ReleaseStatic/ck.pdb b/lib/win/vs12.0/x86/ReleaseStatic/ck.pdb deleted file mode 100755 index 7081dca..0000000 Binary files a/lib/win/vs12.0/x86/ReleaseStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs14.0/x64/DebugDynamic/ck.lib b/lib/win/vs14.0/x64/DebugDynamic/ck.lib deleted file mode 100755 index 0c5d06c..0000000 Binary files a/lib/win/vs14.0/x64/DebugDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs14.0/x64/DebugDynamic/ck.pdb b/lib/win/vs14.0/x64/DebugDynamic/ck.pdb deleted file mode 100755 index 2f3b636..0000000 Binary files a/lib/win/vs14.0/x64/DebugDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs14.0/x64/DebugStatic/ck.lib b/lib/win/vs14.0/x64/DebugStatic/ck.lib deleted file mode 100755 index a1e0a3e..0000000 Binary files a/lib/win/vs14.0/x64/DebugStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs14.0/x64/DebugStatic/ck.pdb b/lib/win/vs14.0/x64/DebugStatic/ck.pdb deleted file mode 100755 index 6a1b4ca..0000000 Binary files a/lib/win/vs14.0/x64/DebugStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs14.0/x64/ReleaseDynamic/ck.lib b/lib/win/vs14.0/x64/ReleaseDynamic/ck.lib deleted file mode 100755 index 9898bda..0000000 Binary files a/lib/win/vs14.0/x64/ReleaseDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs14.0/x64/ReleaseDynamic/ck.pdb b/lib/win/vs14.0/x64/ReleaseDynamic/ck.pdb deleted file mode 100755 index 38fd826..0000000 Binary files a/lib/win/vs14.0/x64/ReleaseDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs14.0/x64/ReleaseStatic/ck.lib b/lib/win/vs14.0/x64/ReleaseStatic/ck.lib deleted file mode 100755 index a07086a..0000000 Binary files a/lib/win/vs14.0/x64/ReleaseStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs14.0/x64/ReleaseStatic/ck.pdb b/lib/win/vs14.0/x64/ReleaseStatic/ck.pdb deleted file mode 100755 index 5a642d1..0000000 Binary files a/lib/win/vs14.0/x64/ReleaseStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs14.0/x86/DebugDynamic/ck.lib b/lib/win/vs14.0/x86/DebugDynamic/ck.lib deleted file mode 100755 index ac2efee..0000000 Binary files a/lib/win/vs14.0/x86/DebugDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs14.0/x86/DebugDynamic/ck.pdb b/lib/win/vs14.0/x86/DebugDynamic/ck.pdb deleted file mode 100755 index d1e50b6..0000000 Binary files a/lib/win/vs14.0/x86/DebugDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs14.0/x86/DebugStatic/ck.lib b/lib/win/vs14.0/x86/DebugStatic/ck.lib deleted file mode 100755 index 0219a14..0000000 Binary files a/lib/win/vs14.0/x86/DebugStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs14.0/x86/DebugStatic/ck.pdb b/lib/win/vs14.0/x86/DebugStatic/ck.pdb deleted file mode 100755 index a8fefe7..0000000 Binary files a/lib/win/vs14.0/x86/DebugStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs14.0/x86/ReleaseDynamic/ck.lib b/lib/win/vs14.0/x86/ReleaseDynamic/ck.lib deleted file mode 100755 index a55b22b..0000000 Binary files a/lib/win/vs14.0/x86/ReleaseDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs14.0/x86/ReleaseDynamic/ck.pdb b/lib/win/vs14.0/x86/ReleaseDynamic/ck.pdb deleted file mode 100755 index 5f99dd3..0000000 Binary files a/lib/win/vs14.0/x86/ReleaseDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs14.0/x86/ReleaseStatic/ck.lib b/lib/win/vs14.0/x86/ReleaseStatic/ck.lib deleted file mode 100755 index 387eb9a..0000000 Binary files a/lib/win/vs14.0/x86/ReleaseStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs14.0/x86/ReleaseStatic/ck.pdb b/lib/win/vs14.0/x86/ReleaseStatic/ck.pdb deleted file mode 100755 index c614caa..0000000 Binary files a/lib/win/vs14.0/x86/ReleaseStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs15.0/x64/DebugDynamic/ck.lib b/lib/win/vs15.0/x64/DebugDynamic/ck.lib deleted file mode 100755 index 45e87e1..0000000 Binary files a/lib/win/vs15.0/x64/DebugDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs15.0/x64/DebugDynamic/ck.pdb b/lib/win/vs15.0/x64/DebugDynamic/ck.pdb deleted file mode 100755 index 3a92300..0000000 Binary files a/lib/win/vs15.0/x64/DebugDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs15.0/x64/DebugStatic/ck.lib b/lib/win/vs15.0/x64/DebugStatic/ck.lib deleted file mode 100755 index 9ad4597..0000000 Binary files a/lib/win/vs15.0/x64/DebugStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs15.0/x64/DebugStatic/ck.pdb b/lib/win/vs15.0/x64/DebugStatic/ck.pdb deleted file mode 100755 index f3a571d..0000000 Binary files a/lib/win/vs15.0/x64/DebugStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs15.0/x64/ReleaseDynamic/ck.lib b/lib/win/vs15.0/x64/ReleaseDynamic/ck.lib deleted file mode 100755 index b16a8b3..0000000 Binary files a/lib/win/vs15.0/x64/ReleaseDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs15.0/x64/ReleaseDynamic/ck.pdb b/lib/win/vs15.0/x64/ReleaseDynamic/ck.pdb deleted file mode 100755 index f9380e5..0000000 Binary files a/lib/win/vs15.0/x64/ReleaseDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs15.0/x64/ReleaseStatic/ck.lib b/lib/win/vs15.0/x64/ReleaseStatic/ck.lib deleted file mode 100755 index 434bdda..0000000 Binary files a/lib/win/vs15.0/x64/ReleaseStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs15.0/x64/ReleaseStatic/ck.pdb b/lib/win/vs15.0/x64/ReleaseStatic/ck.pdb deleted file mode 100755 index 294925d..0000000 Binary files a/lib/win/vs15.0/x64/ReleaseStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs15.0/x86/DebugDynamic/ck.lib b/lib/win/vs15.0/x86/DebugDynamic/ck.lib deleted file mode 100755 index c41976c..0000000 Binary files a/lib/win/vs15.0/x86/DebugDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs15.0/x86/DebugDynamic/ck.pdb b/lib/win/vs15.0/x86/DebugDynamic/ck.pdb deleted file mode 100755 index 8aef4e0..0000000 Binary files a/lib/win/vs15.0/x86/DebugDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs15.0/x86/DebugStatic/ck.lib b/lib/win/vs15.0/x86/DebugStatic/ck.lib deleted file mode 100755 index 04b8ece..0000000 Binary files a/lib/win/vs15.0/x86/DebugStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs15.0/x86/DebugStatic/ck.pdb b/lib/win/vs15.0/x86/DebugStatic/ck.pdb deleted file mode 100755 index 6e3bb96..0000000 Binary files a/lib/win/vs15.0/x86/DebugStatic/ck.pdb and /dev/null differ diff --git a/lib/win/vs15.0/x86/ReleaseDynamic/ck.lib b/lib/win/vs15.0/x86/ReleaseDynamic/ck.lib deleted file mode 100755 index 15b8528..0000000 Binary files a/lib/win/vs15.0/x86/ReleaseDynamic/ck.lib and /dev/null differ diff --git a/lib/win/vs15.0/x86/ReleaseDynamic/ck.pdb b/lib/win/vs15.0/x86/ReleaseDynamic/ck.pdb deleted file mode 100755 index 57c9768..0000000 Binary files a/lib/win/vs15.0/x86/ReleaseDynamic/ck.pdb and /dev/null differ diff --git a/lib/win/vs15.0/x86/ReleaseStatic/ck.lib b/lib/win/vs15.0/x86/ReleaseStatic/ck.lib deleted file mode 100755 index 322605a..0000000 Binary files a/lib/win/vs15.0/x86/ReleaseStatic/ck.lib and /dev/null differ diff --git a/lib/win/vs15.0/x86/ReleaseStatic/ck.pdb b/lib/win/vs15.0/x86/ReleaseStatic/ck.pdb deleted file mode 100755 index 943e270..0000000 Binary files a/lib/win/vs15.0/x86/ReleaseStatic/ck.pdb and /dev/null differ diff --git a/meson.build b/meson.build new file mode 100644 index 0000000..64cd273 --- /dev/null +++ b/meson.build @@ -0,0 +1,91 @@ +project('Cricket', 'c', 'cpp', + version : '1.6.7', + default_options : ['warning_level=3', 'c_std=c99', 'cpp_std=c++17']) + +incdirs = include_directories('inc', 'src', 'ext', 'ext/libogg/include') + +# ogg +src_ogg = ['ext/libogg/src/bitwise.c', 'ext/libogg/src/framing.c'] +lib_ogg = static_library('ogg', src_ogg, include_directories : incdirs, name_prefix: '') +objects_ogg = lib_ogg.extract_objects(src_ogg) + +# tremor +c_args_tremor = [ + '-DLITTLE_ENDIAN=1', '-DBYTE_ORDER=LITTLE_ENDIAN', '-DHAVE_ALLOCA_H', '-DUSE_MEMORY_H', + '-Wno-unused-variable', '-Wno-duplicate-decl-specifier' +] +src_tremor = [ + 'ext/tremor/block.c', 'ext/tremor/codebook.c', 'ext/tremor/floor0.c', 'ext/tremor/floor1.c', 'ext/tremor/info.c', + 'ext/tremor/mapping0.c', 'ext/tremor/mdct.c', 'ext/tremor/registry.c', 'ext/tremor/res012.c', 'ext/tremor/sharedbook.c', + 'ext/tremor/synthesis.c', 'ext/tremor/vorbisfile.c', 'ext/tremor/window.c' +] +lib_tremor = static_library('tremor', src_tremor, include_directories : incdirs, c_args: c_args_tremor, name_prefix: '') +objects_tremor = lib_tremor.extract_objects(src_tremor) + +# Cricket +cpp_args_ck = [ + '-m64', '-msse3', '-mfpmath=sse', '-ffunction-sections', '-funwind-tables', '-fstack-protector', + '-fno-exceptions', '-fstrict-aliasing', '-fno-rtti', + '-Wa,--noexecstack', '-Wno-sign-compare', '-Wformat', '-Werror=format-security', '-Werror=strict-aliasing' +] + +if get_option('buildtype') == 'release' + cpp_args_ck += ['-DNDEBUG', '-DCK_NDEBUG=1'] +else + cpp_args_ck += '-DCK_DEBUG=1' +endif + +src_ck_core = [ + 'src/ck/core/allocatable.cpp', 'src/ck/core/asyncloader.cpp', 'src/ck/core/binarystream.cpp', 'src/ck/core/binarywriter.cpp', + 'src/ck/core/bufferstream.cpp', 'src/ck/core/byteorder.cpp', 'src/ck/core/cond.cpp', 'src/ck/core/customstream.cpp', 'src/ck/core/debug.cpp', + 'src/ck/core/deletable.cpp', 'src/ck/core/dir.cpp', 'src/ck/core/filestream.cpp', 'src/ck/core/filewriter.cpp', + 'src/ck/core/fixedstring.cpp', 'src/ck/core/funcallocator.cpp', 'src/ck/core/glitchfinder.cpp', 'src/ck/core/lockfreequeue.cpp', + 'src/ck/core/lockingqueue.cpp', 'src/ck/core/logger.cpp', 'src/ck/core/math.cpp', 'src/ck/core/md5.cpp', 'src/ck/core/mem.cpp', + 'src/ck/core/memoryfixup.cpp', 'src/ck/core/memorystream.cpp', 'src/ck/core/mutex.cpp', 'src/ck/core/path.cpp', 'src/ck/core/pool.cpp', + 'src/ck/core/profiler.cpp', 'src/ck/core/readstream.cpp', 'src/ck/core/ringbuffer.cpp', 'src/ck/core/runningaverage.cpp', + 'src/ck/core/sse.cpp', 'src/ck/core/stats.cpp', 'src/ck/core/string.cpp', 'src/ck/core/stringwriter.cpp', 'src/ck/core/substream.cpp', + 'src/ck/core/swapstream.cpp', 'src/ck/core/system.cpp', 'src/ck/core/target.cpp', 'src/ck/core/textwriter.cpp', 'src/ck/core/thread.cpp', + 'src/ck/core/timer.cpp', 'src/ck/core/types.cpp', 'src/ck/core/version.cpp' +] + +src_ck_audio = [ + 'src/ck/audio/adpcm.cpp', 'src/ck/audio/adpcmdecoder.cpp', 'src/ck/audio/audio.cpp', 'src/ck/audio/audioformat.cpp', + 'src/ck/audio/audiofileinfo.cpp', 'src/ck/audio/audiograph.cpp', 'src/ck/audio/audionode.cpp', 'src/ck/audio/audiosource.cpp', + 'src/ck/audio/audiostream.cpp', 'src/ck/audio/audioutil.cpp', 'src/ck/audio/audioutil.neon.cpp', 'src/ck/audio/audioutil_sse.cpp', + 'src/ck/audio/audiowriter.cpp', 'src/ck/audio/bank.cpp', 'src/ck/audio/bankdata.cpp', 'src/ck/audio/banksound.cpp', + 'src/ck/audio/biquadfilterprocessor.cpp', 'src/ck/audio/biquadfilterprocessor.neon.cpp', 'src/ck/audio/biquadfilterprocessor_sse.cpp', + 'src/ck/audio/bitcrusherprocessor.cpp', 'src/ck/audio/bitcrusherprocessor.neon.cpp', 'src/ck/audio/bitcrusherprocessor_sse.cpp', + 'src/ck/audio/bufferhandle.cpp', 'src/ck/audio/bufferpool.cpp', 'src/ck/audio/buffersource.cpp', 'src/ck/audio/cksaudiostream.cpp', + 'src/ck/audio/cksstreamsound.cpp', 'src/ck/audio/commandobject.cpp', 'src/ck/audio/customaudiostream.cpp', + 'src/ck/audio/customstreamsound.cpp', 'src/ck/audio/decoder.cpp', 'src/ck/audio/decoderbuf.cpp', 'src/ck/audio/distortionprocessor.cpp', + 'src/ck/audio/distortionprocessor.neon.cpp', 'src/ck/audio/distortionprocessor_sse.cpp', 'src/ck/audio/effect.cpp', + 'src/ck/audio/effectbus.cpp', 'src/ck/audio/effectbusnode.cpp', 'src/ck/audio/effectprocessor.cpp', 'src/ck/audio/fileheader.cpp', + 'src/ck/audio/fourcharcode.cpp', 'src/ck/audio/graphoutput.cpp', 'src/ck/audio/graphoutput_dummy.cpp', 'src/ck/audio/graphsound.cpp', + 'src/ck/audio/mixer.cpp', 'src/ck/audio/mixnode.cpp', 'src/ck/audio/pcmi8decoder.cpp', 'src/ck/audio/pcmi16decoder.cpp', + 'src/ck/audio/pcmf32decoder.cpp', 'src/ck/audio/rawwriter.cpp', 'src/ck/audio/resampler.cpp', 'src/ck/audio/ringmodprocessor.cpp', + 'src/ck/audio/ringmodprocessor.neon.cpp', 'src/ck/audio/ringmodprocessor_sse.cpp', 'src/ck/audio/sample.cpp', + 'src/ck/audio/sampleinfo.cpp', 'src/ck/audio/sharedbuffer.cpp', 'src/ck/audio/sound.cpp', 'src/ck/audio/soundname.cpp', + 'src/ck/audio/sourcenode.cpp', 'src/ck/audio/streamsound.cpp', 'src/ck/audio/streamsource.cpp', 'src/ck/audio/volumematrix.cpp', + 'src/ck/audio/vorbisaudiostream.cpp', 'src/ck/audio/vorbisstreamsound.cpp', 'src/ck/audio/wavwriter.cpp' +] + +src_ck_api = [ + 'src/ck/api/bank.cpp', 'src/ck/api/config.cpp', 'src/ck/api/customfile.cpp', 'src/ck/api/effect.cpp', 'src/ck/api/effectbus.cpp', + 'src/ck/api/effectprocessor.cpp', 'src/ck/api/mixer.cpp', 'src/ck/api/sound.cpp', 'src/ck/api/ck.cpp' +] + +if build_machine.system() == 'linux' + src_ck_core += ['src/ck/core/timer_linux.cpp', 'src/ck/core/system_linux.cpp'] + src_ck_audio += ['src/ck/audio/audio_linux.cpp', 'src/ck/audio/graphoutput_linux.cpp'] +elif build_machine.system() == 'windows' + src_ck_core += ['src/ck/core/system_win.cpp', 'src/ck/core/timer_win.cpp'] + src_ck_audio += [ + 'src/ck/audio/audio_win.cpp', 'src/ck/audio/audiohelpers_win.cpp', 'src/ck/audio/audiohelpers_win7.cpp', + 'src/ck/audio/audiohelpers_win8.cpp', 'src/ck/audio/graphoutput_win.cpp' + ] +endif + +static_library( + 'Cricket', src_ck_core + src_ck_audio + src_ck_api, include_directories : incdirs, + objects : [objects_ogg, objects_tremor], cpp_args: cpp_args_ck, pic: true, name_prefix: '' +) diff --git a/meson.clang.cfg b/meson.clang.cfg new file mode 100644 index 0000000..3a7a6a5 --- /dev/null +++ b/meson.clang.cfg @@ -0,0 +1,7 @@ +[binaries] +c = 'clang' +cpp = 'clang++' +c_ld = 'lld' +cpp_ld = 'lld' +ar = 'llvm-ar' +strip = 'llvm-strip' diff --git a/src/ck.xcworkspace/contents.xcworkspacedata b/src/ck.xcworkspace/contents.xcworkspacedata index 254a64b..46a6862 100644 --- a/src/ck.xcworkspace/contents.xcworkspacedata +++ b/src/ck.xcworkspace/contents.xcworkspacedata @@ -32,9 +32,6 @@ - - diff --git a/lib/ios/Release/libck.a b/src/ck/.vs/ck_win_vs2017/v15/Browse.VC.db similarity index 68% rename from lib/ios/Release/libck.a rename to src/ck/.vs/ck_win_vs2017/v15/Browse.VC.db index 2f8a5ad..55aeac5 100644 Binary files a/lib/ios/Release/libck.a and b/src/ck/.vs/ck_win_vs2017/v15/Browse.VC.db differ diff --git a/src/ck/.vs/ck_win_vs2017/v15/Solution.VC.db b/src/ck/.vs/ck_win_vs2017/v15/Solution.VC.db new file mode 100644 index 0000000..df3ab5b Binary files /dev/null and b/src/ck/.vs/ck_win_vs2017/v15/Solution.VC.db differ diff --git a/src/ck/audio/audiohelpers_win.cpp b/src/ck/audio/audiohelpers_win.cpp old mode 100755 new mode 100644 diff --git a/src/ck/audio/soundname.h b/src/ck/audio/soundname.h index fe1226e..29dfcb4 100644 --- a/src/ck/audio/soundname.h +++ b/src/ck/audio/soundname.h @@ -20,7 +20,7 @@ class SoundName SoundName& operator=(const char*); SoundName& operator=(const SoundName&); - enum { k_len = 32 }; + enum { k_len = 256 }; void set(const char*); diff --git a/src/ck/ck_ios.xcodeproj/xcshareddata/xcschemes/ck_ios.xcscheme b/src/ck/ck_ios.xcodeproj/xcshareddata/xcschemes/ck_ios.xcscheme index b26fccf..e81962b 100644 --- a/src/ck/ck_ios.xcodeproj/xcshareddata/xcschemes/ck_ios.xcscheme +++ b/src/ck/ck_ios.xcodeproj/xcshareddata/xcschemes/ck_ios.xcscheme @@ -1,6 +1,6 @@ - - - - - - - - - - - - ck Win32Proj ck - 10.0.15063.0 + 10.0.17134.0 @@ -505,7 +505,7 @@ WIN32;_DEBUG;_LIB;CK_DEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Use ck/core/pch.h Level3 @@ -557,6 +557,7 @@ true false $(OutDir)$(ProjectName).pdb + true $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) @@ -585,7 +586,7 @@ WIN32;NDEBUG;_LIB;CK_NDEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL Use Level3 ProgramDatabase @@ -597,6 +598,7 @@ true false $(OutDir)$(ProjectName).pdb + true $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) diff --git a/src/ck/ck_win_vs2022.sln b/src/ck/ck_win_vs2022.sln new file mode 100644 index 0000000..04fbd0a --- /dev/null +++ b/src/ck/ck_win_vs2022.sln @@ -0,0 +1,135 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2015 for Windows Desktop +VisualStudioVersion = 12.0.30501.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ck", "ck_win_vs2022.vcxproj", "{BE2EBA34-1AE8-458E-8000-173DED1F4884}" + ProjectSection(ProjectDependencies) = postProject + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76} = {B764497A-FD7E-43AB-B5EB-CC0E6A952C76} + {EDB53074-8394-4DC9-8D68-21C232CFE3A5} = {EDB53074-8394-4DC9-8D68-21C232CFE3A5} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cktool", "..\cktool\cktool_win_vs2022.vcxproj", "{3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}" + ProjectSection(ProjectDependencies) = postProject + {C7360949-D085-46DE-8A6B-D89A443DEB15} = {C7360949-D085-46DE-8A6B-D89A443DEB15} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "..\..\ext\tinyxml\tinyxml_win_vs2022.vcxproj", "{C7360949-D085-46DE-8A6B-D89A443DEB15}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tremor", "..\..\ext\tremor\tremor_win_vs2022.vcxproj", "{B764497A-FD7E-43AB-B5EB-CC0E6A952C76}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "..\..\ext\libogg\ogg_win_vs2022.vcxproj", "{EDB53074-8394-4DC9-8D68-21C232CFE3A5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + DebugDynamic|Win32 = DebugDynamic|Win32 + DebugDynamic|x64 = DebugDynamic|x64 + DebugStatic|Win32 = DebugStatic|Win32 + DebugStatic|x64 = DebugStatic|x64 + ReleaseDynamic|Win32 = ReleaseDynamic|Win32 + ReleaseDynamic|x64 = ReleaseDynamic|x64 + ReleaseStatic|Win32 = ReleaseStatic|Win32 + ReleaseStatic|x64 = ReleaseStatic|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.DebugDynamic|Win32.ActiveCfg = DebugDynamic|Win32 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.DebugDynamic|Win32.Build.0 = DebugDynamic|Win32 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.DebugDynamic|x64.ActiveCfg = DebugDynamic|x64 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.DebugDynamic|x64.Build.0 = DebugDynamic|x64 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.DebugStatic|x64.ActiveCfg = DebugStatic|x64 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.DebugStatic|x64.Build.0 = DebugStatic|x64 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.ReleaseDynamic|Win32.ActiveCfg = ReleaseDynamic|Win32 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.ReleaseDynamic|Win32.Build.0 = ReleaseDynamic|Win32 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.ReleaseDynamic|x64.ActiveCfg = ReleaseDynamic|x64 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.ReleaseDynamic|x64.Build.0 = ReleaseDynamic|x64 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64 + {BE2EBA34-1AE8-458E-8000-173DED1F4884}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.DebugDynamic|Win32.ActiveCfg = DebugDynamic|Win32 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.DebugDynamic|Win32.Build.0 = DebugDynamic|Win32 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.DebugDynamic|x64.ActiveCfg = DebugDynamic|x64 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.DebugDynamic|x64.Build.0 = DebugDynamic|x64 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.DebugStatic|x64.ActiveCfg = DebugStatic|x64 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.DebugStatic|x64.Build.0 = DebugStatic|x64 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.ReleaseDynamic|Win32.ActiveCfg = ReleaseDynamic|Win32 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.ReleaseDynamic|Win32.Build.0 = ReleaseDynamic|Win32 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.ReleaseDynamic|x64.ActiveCfg = ReleaseDynamic|x64 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.ReleaseDynamic|x64.Build.0 = ReleaseDynamic|x64 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64 + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.DebugDynamic|Win32.ActiveCfg = DebugDynamic|Win32 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.DebugDynamic|Win32.Build.0 = DebugDynamic|Win32 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.DebugDynamic|x64.ActiveCfg = DebugDynamic|x64 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.DebugDynamic|x64.Build.0 = DebugDynamic|x64 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.DebugStatic|x64.ActiveCfg = DebugStatic|x64 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.DebugStatic|x64.Build.0 = DebugStatic|x64 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.ReleaseDynamic|Win32.ActiveCfg = ReleaseDynamic|Win32 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.ReleaseDynamic|Win32.Build.0 = ReleaseDynamic|Win32 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.ReleaseDynamic|x64.ActiveCfg = ReleaseDynamic|x64 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.ReleaseDynamic|x64.Build.0 = ReleaseDynamic|x64 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64 + {2C004DBE-550A-45E3-A672-5B1A432A8732}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.DebugDynamic|Win32.ActiveCfg = DebugDynamic|Win32 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.DebugDynamic|Win32.Build.0 = DebugDynamic|Win32 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.DebugDynamic|x64.ActiveCfg = DebugDynamic|x64 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.DebugDynamic|x64.Build.0 = DebugDynamic|x64 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.DebugStatic|x64.ActiveCfg = DebugStatic|x64 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.DebugStatic|x64.Build.0 = DebugStatic|x64 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.ReleaseDynamic|Win32.ActiveCfg = ReleaseDynamic|Win32 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.ReleaseDynamic|Win32.Build.0 = ReleaseDynamic|Win32 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.ReleaseDynamic|x64.ActiveCfg = ReleaseDynamic|x64 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.ReleaseDynamic|x64.Build.0 = ReleaseDynamic|x64 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64 + {C7360949-D085-46DE-8A6B-D89A443DEB15}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.DebugDynamic|Win32.ActiveCfg = DebugDynamic|Win32 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.DebugDynamic|Win32.Build.0 = DebugDynamic|Win32 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.DebugDynamic|x64.ActiveCfg = DebugDynamic|x64 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.DebugDynamic|x64.Build.0 = DebugDynamic|x64 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.DebugStatic|x64.ActiveCfg = DebugStatic|x64 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.DebugStatic|x64.Build.0 = DebugStatic|x64 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.ReleaseDynamic|Win32.ActiveCfg = ReleaseDynamic|Win32 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.ReleaseDynamic|Win32.Build.0 = ReleaseDynamic|Win32 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.ReleaseDynamic|x64.ActiveCfg = ReleaseDynamic|x64 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.ReleaseDynamic|x64.Build.0 = ReleaseDynamic|x64 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64 + {B764497A-FD7E-43AB-B5EB-CC0E6A952C76}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.DebugDynamic|Win32.ActiveCfg = DebugDynamic|Win32 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.DebugDynamic|Win32.Build.0 = DebugDynamic|Win32 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.DebugDynamic|x64.ActiveCfg = DebugDynamic|x64 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.DebugDynamic|x64.Build.0 = DebugDynamic|x64 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.DebugStatic|Win32.ActiveCfg = DebugStatic|Win32 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.DebugStatic|Win32.Build.0 = DebugStatic|Win32 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.DebugStatic|x64.ActiveCfg = DebugStatic|x64 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.DebugStatic|x64.Build.0 = DebugStatic|x64 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.ReleaseDynamic|Win32.ActiveCfg = ReleaseDynamic|Win32 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.ReleaseDynamic|Win32.Build.0 = ReleaseDynamic|Win32 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.ReleaseDynamic|x64.ActiveCfg = ReleaseDynamic|x64 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.ReleaseDynamic|x64.Build.0 = ReleaseDynamic|x64 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64 + {EDB53074-8394-4DC9-8D68-21C232CFE3A5}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/ck/ck_win_vs2022.vcxproj b/src/ck/ck_win_vs2022.vcxproj new file mode 100644 index 0000000..cbc50f5 --- /dev/null +++ b/src/ck/ck_win_vs2022.vcxproj @@ -0,0 +1,630 @@ + + + + + DebugDynamic + Win32 + + + DebugDynamic + x64 + + + DebugStatic + Win32 + + + DebugStatic + x64 + + + ReleaseDynamic + Win32 + + + ReleaseDynamic + x64 + + + ReleaseStatic + Win32 + + + ReleaseStatic + x64 + + + + + + + + + + + + + + + + + + + + ..;../../ext/libogg/include;../../ext;../../inc;$(DXSDK_DIR)/Include + ..;../../ext/libogg/include;../../ext;../../inc;$(DXSDK_DIR)/Include + ..;../../ext/libogg/include;../../ext;../../inc;$(DXSDK_DIR)/Include + ..;../../ext/libogg/include;../../ext;../../inc;$(DXSDK_DIR)/Include + ..;../../ext/libogg/include;../../ext;../../inc;$(DXSDK_DIR)/Include + ..;../../ext/libogg/include;../../ext;../../inc;$(DXSDK_DIR)/Include + ..;../../ext/libogg/include;../../ext;../../inc;$(DXSDK_DIR)/Include + ..;../../ext/libogg/include;../../ext;../../inc;$(DXSDK_DIR)/Include + + + ..;../../ext/libogg/include;../../ext;../../inc;$(WindowsSdkDir)/include/um;$(WindowsSdkDir)/include/shared + ..;../../ext/libogg/include;../../ext;../../inc;$(WindowsSdkDir)/include/um;$(WindowsSdkDir)/include/shared + ..;../../ext/libogg/include;../../ext;../../inc;$(WindowsSdkDir)/include/um;$(WindowsSdkDir)/include/shared + ..;../../ext/libogg/include;../../ext;../../inc;$(WindowsSdkDir)/include/um;$(WindowsSdkDir)/include/shared + ..;../../ext/libogg/include;../../ext;../../inc;$(WindowsSdkDir)/include/um;$(WindowsSdkDir)/include/shared + ..;../../ext/libogg/include;../../ext;../../inc;$(WindowsSdkDir)/include/um;$(WindowsSdkDir)/include/shared + ..;../../ext/libogg/include;../../ext;../../inc;$(WindowsSdkDir)/include/um;$(WindowsSdkDir)/include/shared + ..;../../ext/libogg/include;../../ext;../../inc;$(WindowsSdkDir)/include/um;$(WindowsSdkDir)/include/shared + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create + Create + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {BE2EBA34-1AE8-458E-8000-173DED1F4884} + ck + Win32Proj + ck + 10.0 + + + + StaticLibrary + NotSet + true + v143 + + + StaticLibrary + NotSet + true + v143 + + + StaticLibrary + NotSet + true + v143 + + + StaticLibrary + NotSet + true + v143 + + + StaticLibrary + NotSet + v143 + + + StaticLibrary + NotSet + v143 + + + StaticLibrary + NotSet + v143 + + + StaticLibrary + NotSet + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + $(ProjectDir)..\..\lib\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + + Disabled + WIN32;_DEBUG;_LIB;CK_DEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + ck/core/pch.h + Level3 + EditAndContinue + ck/core/pch.h;%(ForcedIncludeFiles) + ..;../../ext/libogg/include;../../ext;../../inc + $(IntDir)\%(RelativeDir) + true + 4018 + $(OutDir)$(ProjectName).pdb + + + $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) + + + + + Disabled + WIN32;_DEBUG;_LIB;CK_DEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + ck/core/pch.h + Level3 + ProgramDatabase + ck/core/pch.h;%(ForcedIncludeFiles) + ..;../../ext/libogg/include;../../ext;../../inc + $(IntDir)\%(RelativeDir) + true + 4018 + $(OutDir)$(ProjectName).pdb + + + $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) + + + + + Disabled + WIN32;_DEBUG;_LIB;CK_DEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use + ck/core/pch.h + Level3 + EditAndContinue + ck/core/pch.h;%(ForcedIncludeFiles) + ..;../../ext/libogg/include;../../ext;../../inc + $(IntDir)\%(RelativeDir) + true + 4018 + $(OutDir)$(ProjectName).pdb + + + $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) + + + + + Disabled + WIN32;_DEBUG;_LIB;CK_DEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Use + ck/core/pch.h + Level3 + ProgramDatabase + ck/core/pch.h;%(ForcedIncludeFiles) + ..;../../ext/libogg/include;../../ext;../../inc + $(IntDir)\%(RelativeDir) + true + 4018 + $(OutDir)$(ProjectName).pdb + + + $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) + + + + + WIN32;NDEBUG;_LIB;CK_NDEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + ck/core/pch.h;%(ForcedIncludeFiles) + ..;../../ext/libogg/include;../../ext;../../inc + ck/core/pch.h + $(IntDir)\%(RelativeDir) + 4552;4553;4018 + true + false + $(OutDir)$(ProjectName).pdb + true + + + $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) + + + + + WIN32;NDEBUG;_LIB;CK_NDEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + ck/core/pch.h;%(ForcedIncludeFiles) + ..;../../ext/libogg/include;../../ext;../../inc + ck/core/pch.h + $(IntDir)\%(RelativeDir) + 4552;4553;4018 + true + false + $(OutDir)$(ProjectName).pdb + + + $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) + + + + + WIN32;NDEBUG;_LIB;CK_NDEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) + MultiThreadedDLL + Use + Level3 + ProgramDatabase + ck/core/pch.h;%(ForcedIncludeFiles) + ..;../../ext/libogg/include;../../ext;../../inc + ck/core/pch.h + $(IntDir)\%(RelativeDir) + 4552;4553;4018 + true + false + $(OutDir)$(ProjectName).pdb + true + + + $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) + + + + + WIN32;NDEBUG;_LIB;CK_NDEBUG=1;_WIN32_WINNT=0x0602;%(PreprocessorDefinitions) + MultiThreaded + Use + Level3 + ProgramDatabase + ck/core/pch.h;%(ForcedIncludeFiles) + ..;../../ext/libogg/include;../../ext;../../inc + ck/core/pch.h + $(IntDir)\%(RelativeDir) + 4552;4553;4018 + true + false + $(OutDir)$(ProjectName).pdb + + + $(OutDir)\ogg.lib;$(OutDir)\tremor.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/src/ck/ck_win_vs2022.vcxproj.user b/src/ck/ck_win_vs2022.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/src/ck/ck_win_vs2022.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/ck/core/math.h b/src/ck/core/math.h index 1f5559e..0182e69 100644 --- a/src/ck/core/math.h +++ b/src/ck/core/math.h @@ -206,7 +206,7 @@ namespace Math inline float randomFloat(float min, float max) { - return rand() * (max-min) / RAND_MAX; + return rand() * (max-min) / float(RAND_MAX); } //////////////////////////////////////// diff --git a/src/ck/core/pch.cpp b/src/ck/core/pch.cpp old mode 100755 new mode 100644 diff --git a/src/ck/core/pch.h b/src/ck/core/pch.h old mode 100755 new mode 100644 diff --git a/src/ck/core/string.cpp b/src/ck/core/string.cpp index 2479a0a..6a60c5a 100644 --- a/src/ck/core/string.cpp +++ b/src/ck/core/string.cpp @@ -457,6 +457,99 @@ int String::rfind(char c, int start) const return -1; } +int String::find(const String& s) const +{ + return find(s.m_buf, 0); +} + +int String::find(const char* s) const +{ + return find(s, 0); +} + +int String::find(const char* s, int start) const +{ + if (m_length > 0) + { + CK_ASSERT(start >= 0 && start < m_length); + for (int i = start; i < m_length; ++i) + { + int j; + for (j = 0; i + j < m_length; ++j) { + if (m_buf[i + j] != s[j]) + { + break; + } + } + if(s[j] == '\0') + { + return i; + } + } + } + return -1; +} + +int String::rfind(const String& s) const +{ + return rfind(s.m_buf, m_length - 1); +} + +int String::rfind(const char* s) const +{ + return rfind(s, m_length - 1); +} + +int String::rfind(const char* s, int start) const +{ + if (m_length > 0) + { + CK_ASSERT(start >= 0 && start < m_length); + for (int i = start; i >= 0; --i) + { + int j; + for (j = 0; i + j < m_length; ++j) { + if (m_buf[i + j] != s[j]) + { + break; + } + } + if(s[j] == '\0') + { + return i; + } + } + } + return -1; +} + +void String::removeSubstrs(const char* s) { + int len; + for (len = 0; s[len] != '\0'; ++len) + { + ; + } + + for (int i = find(s); i != -1; i = find(s)) + { + erase(i, len); + } +} + +void String::removeSubstrs(const String& s) { + for (int i = find(s); i != -1; i = find(s)) + { + erase(i, s.m_length); + } +} + +void String::removeSubstrs(char c) { + for (int i = find(c); i != -1; i = find(c)) + { + erase(i); + } +} + bool String::operator==(const String& s) const { return equals(s); diff --git a/src/ck/core/string.h b/src/ck/core/string.h index d95d79a..b568806 100644 --- a/src/ck/core/string.h +++ b/src/ck/core/string.h @@ -80,6 +80,20 @@ class String int find(char c, int start) const; int rfind(char c) const; int rfind(char c, int start) const; + + int find(const char*) const; + int find(const char*, int start) const; + int rfind(const char*) const; + int rfind(const char*, int start) const; + + int find(const String&) const; + int find(const String&, int start) const; + int rfind(const String&) const; + int rfind(const String&, int start) const; + + void removeSubstrs(const String&); + void removeSubstrs(const char*); + void removeSubstrs(char); bool operator==(const String&) const; bool operator==(const char*) const; diff --git a/src/cktool/cktool.xcodeproj/project.pbxproj b/src/cktool/cktool.xcodeproj/project.pbxproj index d42b44a..3291af6 100644 --- a/src/cktool/cktool.xcodeproj/project.pbxproj +++ b/src/cktool/cktool.xcodeproj/project.pbxproj @@ -7,12 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + 43FB240C29BF1A1A00923AC1 /* libck.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE93598132AC60200521966 /* libck.a */; }; + 43FB240E29BF1A1A00923AC1 /* libtinyxml_osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43FB240A29BF194300923AC1 /* libtinyxml_osx.a */; }; AA3024B4139E7DF900CE2008 /* aiffreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA3024B1139E7DF900CE2008 /* aiffreader.cpp */; }; AA3024B7139E887A00CE2008 /* audioreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA3024B6139E887A00CE2008 /* audioreader.cpp */; }; AA41499F132AC8C300782F9D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA41499E132AC8C300782F9D /* AudioToolbox.framework */; }; AA4149A1132AC8CB00782F9D /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA4149A0132AC8CB00782F9D /* AudioUnit.framework */; }; AA4149A3132AC8D200782F9D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA4149A2132AC8D200782F9D /* Foundation.framework */; }; - AA67331113D53CD400118909 /* libtinyxml_osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA67331013D53CD400118909 /* libtinyxml_osx.a */; }; AA710B7A13CE332900151CFD /* encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA710B7813CE332900151CFD /* encoder.cpp */; }; AA710B8013CE34AA00151CFD /* pcmi8encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA710B7C13CE34AA00151CFD /* pcmi8encoder.cpp */; }; AA710B8113CE34AA00151CFD /* pcmi16encoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA710B7E13CE34AA00151CFD /* pcmi16encoder.cpp */; }; @@ -20,7 +21,6 @@ AAE93593132AC50E00521966 /* argparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE9358E132AC50E00521966 /* argparser.cpp */; }; AAE93594132AC50E00521966 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE93590132AC50E00521966 /* main.cpp */; }; AAE93595132AC50E00521966 /* wavreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAE93591132AC50E00521966 /* wavreader.cpp */; }; - AAE93599132AC60200521966 /* libck.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE93598132AC60200521966 /* libck.a */; }; AAFEBC5213C4C1980001A141 /* guid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAFEBC5013C4C1980001A141 /* guid.cpp */; }; /* End PBXBuildFile section */ @@ -37,6 +37,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 43FB240A29BF194300923AC1 /* libtinyxml_osx.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtinyxml_osx.a; sourceTree = BUILT_PRODUCTS_DIR; }; AA3024B1139E7DF900CE2008 /* aiffreader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aiffreader.cpp; sourceTree = ""; }; AA3024B2139E7DF900CE2008 /* aiffreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aiffreader.h; sourceTree = ""; }; AA3024B3139E7DF900CE2008 /* audioreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audioreader.h; sourceTree = ""; }; @@ -44,7 +45,6 @@ AA41499E132AC8C300782F9D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; AA4149A0132AC8CB00782F9D /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; AA4149A2132AC8D200782F9D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - AA67331013D53CD400118909 /* libtinyxml_osx.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libtinyxml_osx.a; sourceTree = SOURCE_ROOT; }; AA710B7713CE332900151CFD /* adpcmencoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = adpcmencoder.h; sourceTree = ""; }; AA710B7813CE332900151CFD /* encoder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encoder.cpp; sourceTree = ""; }; AA710B7913CE332900151CFD /* encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = encoder.h; sourceTree = ""; }; @@ -69,11 +69,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - AA67331113D53CD400118909 /* libtinyxml_osx.a in Frameworks */, + 43FB240E29BF1A1A00923AC1 /* libtinyxml_osx.a in Frameworks */, AA4149A3132AC8D200782F9D /* Foundation.framework in Frameworks */, AA4149A1132AC8CB00782F9D /* AudioUnit.framework in Frameworks */, AA41499F132AC8C300782F9D /* AudioToolbox.framework in Frameworks */, - AAE93599132AC60200521966 /* libck.a in Frameworks */, + 43FB240C29BF1A1A00923AC1 /* libck.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -83,6 +83,7 @@ AA4149A6132AC91E00782F9D /* Frameworks */ = { isa = PBXGroup; children = ( + 43FB240A29BF194300923AC1 /* libtinyxml_osx.a */, AAE93598132AC60200521966 /* libck.a */, AA4149A2132AC8D200782F9D /* Foundation.framework */, AA4149A0132AC8CB00782F9D /* AudioUnit.framework */, @@ -94,7 +95,6 @@ AAE93571132AC45A00521966 = { isa = PBXGroup; children = ( - AA67331013D53CD400118909 /* libtinyxml_osx.a */, AA4149A6132AC91E00782F9D /* Frameworks */, AAE9358D132AC4FF00521966 /* Source */, AAE9357D132AC45A00521966 /* Products */, @@ -162,14 +162,15 @@ AAE93573132AC45A00521966 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1420; }; buildConfigurationList = AAE93576132AC45A00521966 /* Build configuration list for PBXProject "cktool" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = AAE93571132AC45A00521966; productRefGroup = AAE9357D132AC45A00521966 /* Products */; @@ -222,6 +223,7 @@ AAE93583132AC45A00521966 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -234,11 +236,13 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -253,7 +257,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -262,6 +266,7 @@ AAE93584132AC45A00521966 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; @@ -274,11 +279,13 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; @@ -289,7 +296,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; SDKROOT = macosx; }; name = Release; @@ -297,15 +304,18 @@ AAE93586132AC45A00521966 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( DEBUG, "CK_DEBUG=1", ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; USER_HEADER_SEARCH_PATHS = ".. ../../inc ../../ext/tinyxml"; }; @@ -314,12 +324,15 @@ AAE93587132AC45A00521966 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PREPROCESSOR_DEFINITIONS = "CK_NDEBUG=1"; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; USER_HEADER_SEARCH_PATHS = ".. ../../inc ../../ext/tinyxml"; }; diff --git a/src/cktool/cktool_win_vs2017.vcxproj b/src/cktool/cktool_win_vs2017.vcxproj index 52c68a0..1a971b2 100755 --- a/src/cktool/cktool_win_vs2017.vcxproj +++ b/src/cktool/cktool_win_vs2017.vcxproj @@ -70,7 +70,7 @@ Win32Proj cktool cktool - 10.0.15063.0 + 10.0.17134.0 @@ -201,13 +201,13 @@ Disabled WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;_DEBUG;_CONSOLE;CK_DEBUG=1;%(PreprocessorDefinitions) ..;../../inc;../../ext/tinyxml - MultiThreadedDebug + MultiThreadedDebugDLL 4018 Console true - %(AdditionalDependencies) + xaudio2.lib;%(AdditionalDependencies) true @@ -227,7 +227,7 @@ Console true - %(AdditionalDependencies) + xaudio2.lib;%(AdditionalDependencies) true @@ -283,7 +283,7 @@ true WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;NDEBUG;_CONSOLE;CK_NDEBUG=1;%(PreprocessorDefinitions) ..;../../inc;../../ext/tinyxml - MultiThreaded + MultiThreadedDLL 4018 @@ -291,7 +291,7 @@ true true true - %(AdditionalDependencies) + xaudio2.lib;%(AdditionalDependencies) true @@ -315,7 +315,7 @@ true true true - %(AdditionalDependencies) + xaudio2.lib;%(AdditionalDependencies) true @@ -372,4 +372,4 @@ - + \ No newline at end of file diff --git a/src/cktool/cktool_win_vs2022.vcxproj b/src/cktool/cktool_win_vs2022.vcxproj new file mode 100644 index 0000000..4af05f0 --- /dev/null +++ b/src/cktool/cktool_win_vs2022.vcxproj @@ -0,0 +1,375 @@ + + + + + DebugDynamic + Win32 + + + DebugDynamic + x64 + + + DebugStatic + Win32 + + + DebugStatic + x64 + + + ReleaseDynamic + Win32 + + + ReleaseDynamic + x64 + + + ReleaseStatic + Win32 + + + ReleaseStatic + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + {c7360949-d085-46de-8a6b-d89a443deb15} + + + {be2eba34-1ae8-458e-8000-173ded1f4884} + + + + {3FF5DB73-CF39-434B-9AB1-E2CDA921A48C} + Win32Proj + cktool + cktool + 10.0 + + + + Application + true + Unicode + v143 + + + Application + true + Unicode + v143 + + + Application + true + Unicode + v143 + + + Application + true + Unicode + v143 + + + Application + false + true + Unicode + v143 + + + Application + false + true + Unicode + v143 + + + Application + false + true + Unicode + v143 + + + Application + false + true + Unicode + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)..\..\bin\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + true + $(ProjectDir)..\..\bin\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + true + $(ProjectDir)..\..\bin\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + true + $(ProjectDir)..\..\bin\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + false + $(ProjectDir)..\..\bin\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + false + $(ProjectDir)..\..\bin\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + false + $(ProjectDir)..\..\bin\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + false + $(ProjectDir)..\..\bin\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + $(ProjectDir)build\win\vs$(VisualStudioVersion)\$(PlatformShortName)\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;_DEBUG;_CONSOLE;CK_DEBUG=1;%(PreprocessorDefinitions) + ..;../../inc;../../ext/tinyxml + MultiThreadedDebugDLL + 4018 + + + Console + true + xaudio2.lib;%(AdditionalDependencies) + + + true + + + + + + + Level3 + Disabled + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;_DEBUG;_CONSOLE;CK_DEBUG=1;%(PreprocessorDefinitions) + ..;../../inc;../../ext/tinyxml + MultiThreadedDebugDLL + 4018 + + + Console + true + xaudio2.lib;%(AdditionalDependencies) + + + true + + + + + + + Level3 + Disabled + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;_DEBUG;_CONSOLE;CK_DEBUG=1;%(PreprocessorDefinitions) + ..;../../inc;../../ext/tinyxml + MultiThreadedDebug + 4018 + + + Console + true + %(AdditionalDependencies) + + + true + + + + + + + Level3 + Disabled + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;_DEBUG;_CONSOLE;CK_DEBUG=1;%(PreprocessorDefinitions) + ..;../../inc;../../ext/tinyxml + MultiThreadedDebugDLL + 4018 + + + Console + true + %(AdditionalDependencies) + + + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;NDEBUG;_CONSOLE;CK_NDEBUG=1;%(PreprocessorDefinitions) + ..;../../inc;../../ext/tinyxml + MultiThreadedDLL + 4018 + + + Console + true + true + true + xaudio2.lib;%(AdditionalDependencies) + + + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;NDEBUG;_CONSOLE;CK_NDEBUG=1;%(PreprocessorDefinitions) + ..;../../inc;../../ext/tinyxml + MultiThreadedDLL + 4018 + + + Console + true + true + true + xaudio2.lib;%(AdditionalDependencies) + + + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;NDEBUG;_CONSOLE;CK_NDEBUG=1;%(PreprocessorDefinitions) + ..;../../inc;../../ext/tinyxml + MultiThreaded + 4018 + + + Console + true + true + true + %(AdditionalDependencies) + + + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE=1;NDEBUG;_CONSOLE;CK_NDEBUG=1;%(PreprocessorDefinitions) + ..;../../inc;../../ext/tinyxml + MultiThreadedDLL + 4018 + + + Console + true + true + true + %(AdditionalDependencies) + + + true + + + + + + \ No newline at end of file diff --git a/src/cktool/cktool_win_vs2022.vcxproj.user b/src/cktool/cktool_win_vs2022.vcxproj.user new file mode 100644 index 0000000..88a5509 --- /dev/null +++ b/src/cktool/cktool_win_vs2022.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/cktool/main.cpp b/src/cktool/main.cpp index edc8037..b3741e1 100644 --- a/src/cktool/main.cpp +++ b/src/cktool/main.cpp @@ -859,7 +859,11 @@ bool extract(const char* path) Path outPath(path); outPath.setExtension(NULL); outPath.append("_"); - outPath.append(sample.name.getBuffer()); + // remove system file separator symbol when using sound bank name in filename + String bankName = sample.name.getBuffer(); + bankName.removeSubstrs('/'); + bankName.removeSubstrs('\\'); + outPath.append(bankName.getBuffer()); outPath.append("_extracted"); outPath.setExtension("wav");