From 4a2e66e4d227a42622e66b079954f47d97e5a090 Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Tue, 12 Apr 2022 14:28:52 -0700 Subject: [PATCH] upper case library name --- CMakeLists.txt | 29 +++++++++++++------------- include/{wellspring.h => Wellspring.h} | 0 src/{wellspring.c => Wellspring.c} | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) rename include/{wellspring.h => Wellspring.h} (100%) rename src/{wellspring.c => Wellspring.c} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2977ca..bbc4fed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.12) -project(wellspring C) +project(Wellspring C) option(BUILD_SHARED_LIBS "Build shared library" ON) option(USE_SDL2 "Use SDL2" ON) @@ -28,11 +28,10 @@ if(APPLE) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) set(LOBJC "objc") elseif(WIN32) - # "wellspring.dll", not "libwellspring.dll" + # "Wellspring.dll", not "libWellspring.dll" set(CMAKE_SHARED_LIBRARY_PREFIX "") endif() if(UNIX) - SET(BIN_RPATH "\$ORIGIN;\$ORIGIN/assets") #thanks yoyo games set(CMAKE_SKIP_BUILD_RPATH TRUE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH ${BIN_RPATH}) @@ -43,29 +42,29 @@ if(USE_SDL2) add_definitions(-DUSE_SDL2) endif() -add_library(wellspring +add_library(Wellspring #Public header - include/wellspring.h + include/Wellspring.h #Source lib/stb_rect_pack.h lib/stb_truetype.h - src/wellspring.c + src/Wellspring.c ) # Build flags if(NOT MSVC) - set_property(TARGET wellspring PROPERTY COMPILE_FLAGS "-std=gnu99 -Wall -Wno-strict-aliasing -pedantic") + set_property(TARGET Wellspring PROPERTY COMPILE_FLAGS "-std=gnu99 -Wall -Wno-strict-aliasing -pedantic") endif() # includes -target_include_directories(wellspring PUBLIC +target_include_directories(Wellspring PUBLIC $ $ $ ) # Soname -set_target_properties(wellspring PROPERTIES OUTPUT_NAME "wellspring" +set_target_properties(Wellspring PROPERTIES OUTPUT_NAME "Wellspring" VERSION ${LIB_VERSION} SOVERSION ${LIB_MAJOR_VERSION} ) @@ -74,21 +73,21 @@ set_target_properties(wellspring PROPERTIES OUTPUT_NAME "wellspring" if(USE_SDL2) if (DEFINED SDL2_INCLUDE_DIRS AND DEFINED SDL2_LIBRARIES) message(STATUS "using pre-defined SDL2 variables SDL2_INCLUDE_DIRS and SDL2_LIBRARIES") - target_include_directories(wellspring PUBLIC "$") - target_link_libraries(wellspring PUBLIC ${SDL2_LIBRARIES}) + target_include_directories(Wellspring PUBLIC "$") + target_link_libraries(Wellspring PUBLIC ${SDL2_LIBRARIES}) else() # Only try to autodetect if both SDL2 variables aren't explicitly set find_package(SDL2 CONFIG) if (TARGET SDL2::SDL2) message(STATUS "using TARGET SDL2::SDL2") - target_link_libraries(wellspring PUBLIC SDL2::SDL2) + target_link_libraries(Wellspring PUBLIC SDL2::SDL2) elseif (TARGET SDL2) message(STATUS "using TARGET SDL2") - target_link_libraries(wellspring PUBLIC SDL2) + target_link_libraries(Wellspring PUBLIC SDL2) else() message(STATUS "no TARGET SDL2::SDL2, or SDL2, using variables") - target_include_directories(wellspring PUBLIC "$") - target_link_libraries(wellspring PUBLIC ${SDL2_LIBRARIES}) + target_include_directories(Wellspring PUBLIC "$") + target_link_libraries(Wellspring PUBLIC ${SDL2_LIBRARIES}) endif() endif() endif() diff --git a/include/wellspring.h b/include/Wellspring.h similarity index 100% rename from include/wellspring.h rename to include/Wellspring.h diff --git a/src/wellspring.c b/src/Wellspring.c similarity index 99% rename from src/wellspring.c rename to src/Wellspring.c index 6ca255a..1348433 100644 --- a/src/wellspring.c +++ b/src/Wellspring.c @@ -24,7 +24,7 @@ * */ -#include "wellspring.h" +#include "Wellspring.h" #include "stb_rect_pack.h" #define STBTT_malloc(x,u) ((void)(u),Wellspring_malloc(x))