Remove libz from portlibs folder

Update readme
Rename library to guiwut
This commit is contained in:
Maschell 2018-06-23 16:05:07 +02:00
parent 5fd8c7c0f6
commit 03ad816adc
3 changed files with 16 additions and 17 deletions

View File

@ -1,31 +1,31 @@
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
project(gui) project(guiwut)
include("${WUT_ROOT}/share/wut.cmake" REQUIRED) include("${WUT_ROOT}/share/wut.cmake" REQUIRED)
file(GLOB_RECURSE SOURCE_FILES *.c *.cpp) file(GLOB_RECURSE SOURCE_FILES *.c *.cpp)
file(GLOB_RECURSE HEADER_FILES *.h*) 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 target_link_libraries(guiwut
utils) 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" REQUIRED)
include_directories("$ENV{DEVKITPRO}/portlibs/ppc/include/freetype2" REQUIRED) include_directories("$ENV{DEVKITPRO}/portlibs/ppc/include/freetype2" REQUIRED)
target_include_directories(gui PUBLIC "include") target_include_directories(guiwut PUBLIC "include")
target_include_directories(gui PRIVATE "src") target_include_directories(guiwut PRIVATE "src")
wut_enable_stdcpp(gui) wut_enable_stdcpp(guiwut)
wut_default_malloc(gui) wut_default_malloc(guiwut)
target_include_directories(gui PUBLIC "include") target_include_directories(guiwut PUBLIC "include")
target_compile_options(gui PUBLIC "-D__LOGGING__") target_compile_options(guiwut PUBLIC "-D__LOGGING__")
install(TARGETS gui install(TARGETS guiwut
ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib")
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
DESTINATION "${CMAKE_INSTALL_PREFIX}/include/libgui" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/libguiwut"
FILES_MATCHING PATTERN "*.h*") FILES_MATCHING PATTERN "*.h*")

View File

@ -13,14 +13,14 @@ memoryRelease();
Link the application with: Link the application with:
```Makefile ```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: You also need to add the include path to your Makefile. Example:
```Makefile ```Makefile
export INCLUDE := [...] -I$(PORTLIBS)/include/freetype2 \ export INCLUDE := [...] -I$(PORTLIBS)/include/freetype2 \
-I$(WUT_ROOT)/include/libgui \ -I$(WUT_ROOT)/include/libguiwut \
-I$(PORTLIBS)/include -I$(PORTLIBS)/include
``` ```
@ -40,8 +40,7 @@ This package includes:
- freetype2 - freetype2
- libgd - libgd
- libpng - libpng
- libjpeg - libjpeg
- libz
- libmad - libmad
- vorbisidec - vorbisidec

Binary file not shown.