From b7ff175dbad4e2db843277d94e3a36944b624372 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Tue, 26 Jan 2016 20:43:15 -0800 Subject: [PATCH] Migrate to buildtools. --- .gitignore | 5 ++++- .gitmodules | 3 +++ CMakeLists.txt | 7 ------- Makefile | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 3 +-- buildtools | 1 + 6 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 .gitmodules delete mode 100644 CMakeLists.txt create mode 100644 Makefile create mode 160000 buildtools diff --git a/.gitignore b/.gitignore index 4afcf19..d6cca24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .idea -build \ No newline at end of file +CMakeLists.txt + +build +output diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0cd389c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "buildtools"] + path = buildtools + url = git://github.com/Steveice10/buildtools diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 053b3d6..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -cmake_minimum_required(VERSION 2.8.4) -project(bannertool) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - -set(SOURCE_FILES source/main.cpp source/cmd.cpp source/pc/wav.cpp source/3ds/cbmd.cpp source/3ds/cwav.cpp source/3ds/lz11.cpp source/3ds/util.cpp source/pc/lodepng.cpp) -add_executable(bannertool ${SOURCE_FILES}) \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..6473c13 --- /dev/null +++ b/Makefile @@ -0,0 +1,50 @@ +# TARGET # + +TARGET := PC +LIBRARY := 0 + +ifeq ($(TARGET),3DS) + ifeq ($(strip $(DEVKITPRO)),) + $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitPro") + endif + + ifeq ($(strip $(DEVKITARM)),) + $(error "Please set DEVKITARM in your environment. export DEVKITARM=devkitARM") + endif +endif + +# COMMON CONFIGURATION # + +NAME := bannertool + +BUILD_DIR := build +OUTPUT_DIR := output +INCLUDE_DIRS := include +SOURCE_DIRS := source + +EXTRA_OUTPUT_FILES := + +LIBRARY_DIRS := +LIBRARIES := + +BUILD_FLAGS := -Wno-unused-result -Wno-sign-compare +RUN_FLAGS := + +# 3DS CONFIGURATION # + +DESCRIPTION := +AUTHOR := +PRODUCT_CODE := +UNIQUE_ID := + +SYSTEM_MODE := +SYSTEM_MODE_EXT := + +ROMFS_DIR := +BANNER_AUDIO := +BANNER_IMAGE := +ICON := + +# INTERNAL # + +include buildtools/make_base diff --git a/README.md b/README.md index 0522144..a755c6f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -
bannertool
-========== +# bannertool A tool for creating 3DS banners. diff --git a/buildtools b/buildtools new file mode 160000 index 0000000..2b464d8 --- /dev/null +++ b/buildtools @@ -0,0 +1 @@ +Subproject commit 2b464d8e90ba23ae6233e517eb7ec22fb797f880