diff --git a/CMakeLists.txt b/CMakeLists.txt index e0cc7ed..a2e18b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,31 +1,31 @@ cmake_minimum_required(VERSION 3.2) -project(gui) +project(guiwut) include("${WUT_ROOT}/share/wut.cmake" REQUIRED) file(GLOB_RECURSE SOURCE_FILES *.c *.cpp) file(GLOB_RECURSE HEADER_FILES *.h*) -add_library(gui STATIC ${SOURCE_FILES} ${HEADER_FILES}) +add_library(guiwut STATIC ${SOURCE_FILES} ${HEADER_FILES}) -target_link_libraries(gui - utils) +target_link_libraries(guiwut + utilswut) -include_directories("$ENV{WUT_ROOT}/include/libutils" REQUIRED) +include_directories("$ENV{WUT_ROOT}/include/libutilswut" REQUIRED) include_directories("$ENV{DEVKITPRO}/portlibs/ppc/include" REQUIRED) include_directories("$ENV{DEVKITPRO}/portlibs/ppc/include/freetype2" REQUIRED) -target_include_directories(gui PUBLIC "include") -target_include_directories(gui PRIVATE "src") +target_include_directories(guiwut PUBLIC "include") +target_include_directories(guiwut PRIVATE "src") -wut_enable_stdcpp(gui) -wut_default_malloc(gui) +wut_enable_stdcpp(guiwut) +wut_default_malloc(guiwut) -target_include_directories(gui PUBLIC "include") -target_compile_options(gui PUBLIC "-D__LOGGING__") +target_include_directories(guiwut PUBLIC "include") +target_compile_options(guiwut PUBLIC "-D__LOGGING__") -install(TARGETS gui +install(TARGETS guiwut ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ - DESTINATION "${CMAKE_INSTALL_PREFIX}/include/libgui" + DESTINATION "${CMAKE_INSTALL_PREFIX}/include/libguiwut" FILES_MATCHING PATTERN "*.h*") \ No newline at end of file diff --git a/README.md b/README.md index 07addaa..1a6a31c 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,14 @@ memoryRelease(); Link the application with: ```Makefile --lgui -lutilswut -lfreetype -lgd -lpng -ljpeg -lz -lmad -lvorbisidec +-lguiwut -lutilswut -lfreetype -lgd -lpng -ljpeg -lmad -lvorbisidec -lzlib125 ``` You also need to add the include path to your Makefile. Example: ```Makefile export INCLUDE := [...] -I$(PORTLIBS)/include/freetype2 \ - -I$(WUT_ROOT)/include/libgui \ + -I$(WUT_ROOT)/include/libguiwut \ -I$(PORTLIBS)/include ``` @@ -40,8 +40,7 @@ This package includes: - freetype2 - libgd - libpng -- libjpeg -- libz +- libjpeg - libmad - vorbisidec diff --git a/libs/portlibs.zip b/libs/portlibs.zip index 7298fc8..c8ac219 100644 Binary files a/libs/portlibs.zip and b/libs/portlibs.zip differ