Minor changes

This commit is contained in:
Elouan Appéré
2015-08-31 19:08:25 +02:00
parent c8917527d2
commit c4527dbb3e
5 changed files with 21 additions and 7 deletions

View File

@@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 2.8.12)
project(PkmGCTools)
set(CMAKE_INSTALL_PREFIX installdir)
option(BUILD_PKMGCSAVEEDITOR "Build PkmGCSaveEditor" ON)
message("BUILD_PKMGCSAVEEDITOR:\t${BUILD_PKMGCSAVEEDITOR}")
set(CMAKE_INSTALL_PREFIX installdir)
add_subdirectory(LibPkmGC)
add_definitions(${LIBPKMGC_DEFINITIONS})
message("BUILD_PKMGCSAVEEDITOR:\t${BUILD_PKMGCSAVEEDITOR}")
if(BUILD_PKMGCSAVEEDITOR)
add_subdirectory(PkmGCSaveEditor)
install(FILES ${LIBPKMGC_RUNTIME} DESTINATION Debug/bin CONFIGURATIONS Debug)

View File

@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 2.8.12)
project(LibPkmGC)
option(LIBPKMGC_DYN_LIB "Build LibPkmGC as a shared library" ON)
message("LIBPKMGC_DYN_LIB:\t${LIBPKMGC_DYN_LIB}")
include(FindBoost)
find_package(Boost 1.55.0 REQUIRED)
@@ -16,9 +18,7 @@ set(LIBPKMGC_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/include
include_directories(${LIBPKMGC_INCLUDE_DIRS})
option(LIBPKMGC_DYN_LIB "Build LibPkmGC as a shared library" ON)
message("LIBPKMGC_DYN_LIB:\t${LIBPKMGC_DYN_LIB}")
add_definitions(-DLIBPKMGC_SOURCE)
unset(LIBPKMGC_RUNTIME CACHE)
@@ -30,12 +30,16 @@ if(LIBPKMGC_DYN_LIB)
set(LIBPKMGC_RUNTIME $<TARGET_FILE:LibPkmGC> CACHE INTERNAL "Runtime dependencies for projects linking against this library" FORCE)
install(FILES $<TARGET_FILE:LibPkmGC> $<TARGET_LINKER_FILE:LibPkmGC> DESTINATION Release/lib/shared CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
install(FILES $<TARGET_FILE:LibPkmGC> $<TARGET_LINKER_FILE:LibPkmGC> DESTINATION Debug/lib/shared CONFIGURATIONS Debug)
install(FILES "README.md" "LICENSE" DESTINATION Debug/lib/shared CONFIGURATIONS Debug)
install(FILES "README.md" "LICENSE" DESTINATION Release/lib/shared CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
else()
set(LIBPKMGC_DEFINITIONS -DLIBPKMGC_STATIC_LIB CACHE INTERNAL "LibPkmGC's definitions" FORCE)
add_definitions(-DLIBPKMGC_STATIC_LIB)
add_library(LibPkmGC STATIC ${all_files})
install(FILES $<TARGET_FILE:LibPkmGC> DESTINATION Release/lib/static CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
install(FILES $<TARGET_FILE:LibPkmGC> DESTINATION Debug/lib/static CONFIGURATIONS Debug)
install(FILES "README.md" "LICENSE" DESTINATION Debug/lib/static CONFIGURATIONS Debug)
install(FILES "README.md" "LICENSE" DESTINATION Release/lib/static CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
endif()
set_target_properties(LibPkmGC PROPERTIES PREFIX "" IMPORT_PREFIX "")

View File

@@ -20,7 +20,13 @@
#define _LIBPKMGC_STRUCT_MACROS_H
#include <LibPkmGC/Core/IntegerManip.h>
#include <boost/core/enable_if.hpp>
#include <boost/version.hpp>
#if BOOST_VERSION < 105600
# include <boost/utility/enable_if.hpp> // < 1.56
#else
# include <boost/core/enable_if.hpp>
#endif
#ifdef LIBPKMGC_SOURCE
# define LIBPKMGC_DEFINE_IMPL_HELPER_MACROS

View File

@@ -89,3 +89,7 @@ endif()
install(PROGRAMS $<TARGET_FILE:PkmGCSaveEditor> DESTINATION Debug/bin CONFIGURATIONS Debug)
install(PROGRAMS $<TARGET_FILE:PkmGCSaveEditor> DESTINATION Release/bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
install(FILES "README.md" "LICENSE" DESTINATION Debug/bin CONFIGURATIONS Debug)
install(FILES "README.md" "LICENSE" DESTINATION Release/bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)

View File

@@ -18,7 +18,7 @@ Editing your Mailbox and your Battle Mode data.
* Dumped names (thanks [Tiddlywinks](http://projectpokemon.org/forums/showthread.php?46253-Stars-Pokemon-colosseum-and-XD-hacking-tutorial-part-2-Text-editing&p=205271&viewfull=1#post205271)!): English, French, German, Spanish, Italian, Japanese
##Download links:
* PkmGCSaveEditor v1.0 Win32 binaries:
* PkmGCSaveEditor v1.0.0 Win32 binaries:
* Source: https://github.com/TuxSH/PkmGCTools . You will need CMake ≥ 2.8.12, Qt ≥ 5.2, Boost ≥ 1.55 to compile this project.
##Special thanks to: