浏览代码

Rename some libs

Panagiotis Christopoulos Charitos 4 年之前
父节点
当前提交
5cb4f49aa6

+ 1 - 1
AnKi/Resource/ResourceFilesystem.cpp

@@ -263,7 +263,7 @@ void ResourceFilesystem::addCachePath(const CString& path)
 Error ResourceFilesystem::addNewPath(const CString& path)
 {
 	U32 fileCount = 0;
-	static const CString extension(".ankizip");
+	static const CString extension(".AnKiZLibip");
 
 	auto pos = path.find(extension);
 	if(pos != CString::NPOS && pos == path.getLength() - extension.getLength())

+ 9 - 9
CMakeLists.txt

@@ -352,9 +352,9 @@ endif()
 # Set platform specific
 if(LINUX)
 	if(GL)
-		set(THIRD_PARTY_LIBS ${ANKI_GR_BACKEND} ankiglew)
+		set(THIRD_PARTY_LIBS ${ANKI_GR_BACKEND} AnKiGlew)
 	else()
-		set(THIRD_PARTY_LIBS ankivolk)
+		set(THIRD_PARTY_LIBS AnKiVolk)
 		if(SDL)
 			set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} X11-xcb)
 		else()
@@ -365,16 +365,16 @@ if(LINUX)
 	set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} pthread dl)
 elseif(MACOS)
 	find_package(OpenGL REQUIRED)
-	set(THIRD_PARTY_LIBS ${OPENGL_LIBRARIES} ankiglew pthread)
+	set(THIRD_PARTY_LIBS ${OPENGL_LIBRARIES} AnKiGlew pthread)
 elseif(ANDROID)
 	set(THIRD_PARTY_LIBS GLESv3 EGL log android)
 	include_directories("${ANDROID_NDK}/sources/android/native_app_glue")
 	set(_SYS_SRC "${ANDROID_NDK}/sources/android/native_app_glue/android_native_app_glue.c")
 elseif(WINDOWS)
 	if(GL)
-		set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} ankiglew opengl32)
+		set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} AnKiGlew opengl32)
 	else()
-		set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} ankivolk)
+		set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} AnKiVolk)
 	endif()
 
 	set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} version Imm32 Winmm DbgHelp)
@@ -387,15 +387,15 @@ if(SDL)
 endif()
 
 set(THIRD_PARTY_LIBS ${THIRD_PARTY_LIBS} BulletSoftBody BulletDynamics BulletCollision LinearMath
-	ankispirvcross ankitinyxml2 ankilua ankimeshoptimizer ankiz glslang SPIRV OGLCompiler OSDependent ankiimgui)
+	AnKiSpirvCross AnKiTinyXml2 AnKiLua AnKiMeshOptimizer AnKiZLib glslang SPIRV OGLCompiler OSDependent AnKiImGui)
 
 # Add AnKi sub libraries
 add_subdirectory(AnKi)
 
 separate_arguments(AK_SOURCES)
-add_library(anki ${AK_SOURCES})
-target_compile_definitions(anki PRIVATE -DANKI_SOURCE_FILE)
-target_link_libraries(anki ${THIRD_PARTY_LIBS})
+add_library(AnKi ${AK_SOURCES})
+target_compile_definitions(AnKi PRIVATE -DANKI_SOURCE_FILE)
+target_link_libraries(AnKi ${THIRD_PARTY_LIBS})
 
 ################################################################################
 # AnKi extra                                                                   #

+ 0 - 0
EngineAssets/light_meshes.blend → EngineAssets/LightMeshes.blend


+ 1 - 1
Samples/PhysicsPlayground/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_executable(PhysicsPlayground Main.cpp ../Common/Framework.cpp)
-target_link_libraries(PhysicsPlayground anki)
+target_link_libraries(PhysicsPlayground AnKi)
 
 installExecutable(PhysicsPlayground)

+ 1 - 1
Samples/SimpleScene/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_executable(SimpleScene Main.cpp ../Common/Framework.cpp)
-target_link_libraries(SimpleScene anki)
+target_link_libraries(SimpleScene AnKi)
 
 installExecutable(SimpleScene)

+ 1 - 1
Samples/SkeletalAnimation/CMakeLists.txt

@@ -1,3 +1,3 @@
 add_executable(SkeletalAnimation Main.cpp ../Common/Framework.cpp)
-target_link_libraries(SkeletalAnimation anki)
+target_link_libraries(SkeletalAnimation AnKi)
 installExecutable(SkeletalAnimation)

+ 1 - 1
Samples/Sponza/CMakeLists.txt

@@ -1,3 +1,3 @@
 add_executable(Sponza Main.cpp ../Common/Framework.cpp)
-target_link_libraries(Sponza anki)
+target_link_libraries(Sponza AnKi)
 installExecutable(Sponza)

+ 1 - 1
Sandbox/CMakeLists.txt

@@ -1,3 +1,3 @@
 add_executable(Sandbox Main.cpp)
-target_link_libraries(Sandbox anki)
+target_link_libraries(Sandbox AnKi)
 installExecutable(Sandbox)

+ 1 - 1
Tests/CMakeLists.txt

@@ -5,6 +5,6 @@ include_directories("..")
 
 add_executable(Tests ${TESTS_SOURCES} ${TESTS_HEADERS})
 target_compile_definitions(Tests PRIVATE -DANKI_SOURCE_FILE)
-target_link_libraries(Tests anki)
+target_link_libraries(Tests AnKi)
 
 installExecutable(Tests)

+ 1 - 1
Tests/Resource/ResourceFilesystem.cpp

@@ -26,7 +26,7 @@ ANKI_TEST(Resource, ResourceFilesystem)
 	}
 
 	{
-		ANKI_TEST_EXPECT_NO_ERR(fs.addNewPath("./Tests/Data/Dir.ankizip"));
+		ANKI_TEST_EXPECT_NO_ERR(fs.addNewPath("./Tests/Data/Dir.AnKiZLibip"));
 		ResourceFilePtr file;
 		ANKI_TEST_EXPECT_NO_ERR(fs.openFile("subdir0/hello.txt", file));
 		StringAuto txt(alloc);

+ 2 - 2
ThirdParty/ImGui/CMakeLists.txt

@@ -1,12 +1,12 @@
 file(GLOB_RECURSE SRC *.cpp)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-# Point to a couple of dirs because ImGUI's config points to anki headers
+# Point to a couple of dirs because ImGUI's config points to AnKi headers
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../..)
 if(NOT MSVC)
 	add_definitions("-std=c++14")
 endif()
 
-add_library(ankiimgui ${SRC})
+add_library(AnKiImGui ${SRC})
 

+ 1 - 2
ThirdParty/Lua/CMakeLists.txt

@@ -7,6 +7,5 @@ if(NOT WINDOWS)
 endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_library(ankilua ${LUA_SOURCES} ${LUA_HEADERS})
-#set_target_properties(ankilua PROPERTIES LINKER_LANGUAGE C COMPILE_FLAGS "-DLUA_USE_POSIX")
+add_library(AnKiLua ${LUA_SOURCES} ${LUA_HEADERS})
 

+ 1 - 1
ThirdParty/MeshOptimizer/CMakeLists.txt

@@ -1,3 +1,3 @@
 file(GLOB_RECURSE SOURCES *.cpp)
-add_library(ankimeshoptimizer ${SOURCES})
+add_library(AnKiMeshOptimizer ${SOURCES})
 

+ 4 - 4
ThirdParty/SprivCross/CMakeLists.txt

@@ -1,11 +1,11 @@
 file(GLOB_RECURSE SOURCES *.cpp)
 
-add_library(ankispirvcross ${SOURCES})
+add_library(AnKiSpirvCross ${SOURCES})
 
-target_include_directories(ankispirvcross PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
+target_include_directories(AnKiSpirvCross PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-target_compile_definitions(ankispirvcross PRIVATE SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
+target_compile_definitions(AnKiSpirvCross PRIVATE SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
 
 if(GCC)
-	target_compile_options(ankispirvcross PRIVATE -std=c++11)
+	target_compile_options(AnKiSpirvCross PRIVATE -std=c++11)
 endif()

+ 1 - 1
ThirdParty/TinyXml2/CMakeLists.txt

@@ -3,4 +3,4 @@ FILE(GLOB_RECURSE TXML2_HEADERS *.h)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-ADD_LIBRARY(ankitinyxml2 ${TXML2_SOURCES} ${TXML2_HEADERS})
+ADD_LIBRARY(AnKiTinyXml2 ${TXML2_SOURCES} ${TXML2_HEADERS})

+ 1 - 1
ThirdParty/Volk/CMakeLists.txt

@@ -1,4 +1,4 @@
 file(GLOB_RECURSE SOURCE_FILES *.c)
 include_directories(../Khronos)
 add_compile_definitions("VK_KHR_ray_tracing_pipeline" "VK_KHR_acceleration_structure")
-add_library(ankivolk ${SOURCE_FILES})
+add_library(AnKiVolk ${SOURCE_FILES})

+ 2 - 2
ThirdParty/ZLib/CMakeLists.txt

@@ -5,5 +5,5 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/)
 
 add_definitions(-DUSE_FILE32API)
 
-add_library(ankiz ${ZLIB_SOURCES} ${ZLIB_HEADERS})
-set_target_properties(ankiz PROPERTIES LINKER_LANGUAGE C)
+add_library(AnKiZLib ${ZLIB_SOURCES} ${ZLIB_HEADERS})
+set_target_properties(AnKiZLib PROPERTIES LINKER_LANGUAGE C)

+ 1 - 1
Tools/GltfImporter/CMakeLists.txt

@@ -1,5 +1,5 @@
 file(GLOB_RECURSE SOURCES *.cpp)
 
 add_executable(GltfImporter ${SOURCES})
-target_link_libraries(GltfImporter anki)
+target_link_libraries(GltfImporter AnKi)
 installExecutable(GltfImporter)

+ 2 - 2
Tools/Shader/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_executable(ShaderDump ShaderProgramBinaryDumpMain.cpp)
-target_link_libraries(ShaderDump anki)
+target_link_libraries(ShaderDump AnKi)
 installExecutable(ShaderDump)
 
 add_executable(ShaderCompiler ShaderProgramCompilerMain.cpp)
-target_link_libraries(ShaderCompiler anki)
+target_link_libraries(ShaderCompiler AnKi)
 installExecutable(ShaderCompiler)