Merge pull request #89 from carstene1ns/feature/lmu-gui

lmu2png: Add wxWidgets GUI

Author: Ghabry

lmu2png/AUTHORS

@@ -0,0 +1,16 @@
+# LMU2PNG Authors:
+
+ * Zegeri
+ * 20kdc
+ * carstene1ns
+
+LMU2PNG is based on LMU2BMP.
+
+## LMU2BMP Author:
+
+ * Gustavo Valiente "Chano" (chano)
+
+LMU2BMP Includes EasyRPG project code from the following authors:
+
+ * Héctor Barreiro "Damizean" (damizean)
+ * Francisco de la Peña "delaPipol" (fdelapena)

lmu2png/AUTHORS.md

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(lmu2png VERSION 1.2 LANGUAGES CXX
+project(lmu2png VERSION 2.0 LANGUAGES CXX
 	HOMEPAGE_URL "https://easyrpg.org/")
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
@@ -9,6 +9,14 @@ find_package(ZLIB REQUIRED)
 find_package(liblcf REQUIRED)
 find_package(FreeImage REQUIRED)
 
+set(WITH_GUI "Automatic" CACHE STRING "Build a GUI frontend (ON/OFF/Automatic), Default: Automatic")
+set_property(CACHE WITH_GUI PROPERTY STRINGS ON OFF Automatic)
+if(WITH_GUI STREQUAL "Automatic")
+	find_package(wxWidgets CONFIG)
+elseif(WITH_GUI STREQUAL "ON")
+	find_package(wxWidgets CONFIG REQUIRED)
+endif()
+
 set(argparse_dir src/external/argparse)
 add_executable(lmu2png
 	src/main.h
@@ -17,6 +25,8 @@ add_executable(lmu2png
 	src/chipset.cpp
 	src/xyzplugin.h
 	src/xyzplugin.cpp
+	src/utils.h
+	src/utils.cpp
 	${argparse_dir}/argparse.hpp)
 target_compile_features(lmu2png PRIVATE cxx_std_17)
 target_include_directories(lmu2png PRIVATE ${argparse_dir})
@@ -26,5 +36,17 @@ target_compile_definitions(lmu2png PRIVATE
 	PACKAGE_URL="${PROJECT_HOMEPAGE_URL}")
 target_link_libraries(lmu2png ZLIB::ZLIB freeimage::FreeImage liblcf::liblcf)
 
+if(wxWidgets_FOUND)
+	target_compile_definitions(lmu2png PRIVATE WITH_GUI)
+	target_sources(lmu2png PRIVATE
+		src/gui.h
+		src/gui.cpp)
+	target_link_libraries(lmu2png wx::base wx::core)
+	set(GUI_STATUS "Enabled (wxWidgets ${wxWidgets_VERSION})")
+else()
+	set(GUI_STATUS "Disabled")
+endif()
+message(STATUS "GUI is ${GUI_STATUS}")
+
 include(GNUInstallDirs)
 install(TARGETS lmu2png RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

lmu2png/CMakeLists.txt

@@ -1,6 +1,6 @@
 argparsedir = src/external/argparse
 
-EXTRA_DIST = README.md \
+EXTRA_DIST = README.md AUTHORS.md \
 	CMakeLists.txt \
 	CMakeModules/ConfigureWindows.cmake \
 	CMakeModules/FindFreeImage.cmake \
@@ -15,6 +15,8 @@ lmu2png_SOURCES = \
 	src/chipset.cpp \
 	src/xyzplugin.h \
 	src/xyzplugin.cpp \
+	src/utils.h \
+	src/utils.cpp \
 	$(argparsedir)/argparse.hpp
 lmu2png_CXXFLAGS = \
 	-std=c++17 \

lmu2png/Makefile.am

@@ -1,7 +1,6 @@
 # LMU2PNG
 
-LMU2PNG is a small tool to render RPG Maker 2000 and 2003 map data into PNG
-images.
+LMU2PNG is a tool to render RPG Maker 2000 and 2003 map data into PNG images.
 
 LMU2PNG is part of the EasyRPG Project.
 More information is available at the project website:
@@ -21,6 +20,7 @@ https://wiki.easyrpg.org/
  * liblcf - https://github.com/EasyRPG/liblcf
  * zlib
  * SDL2_image (enable support for at least png images)
+ * wxWidgets (optional, GUI version)
 
 
 ## Daily builds

lmu2png/README.md

@@ -1,4 +1,4 @@
-AC_INIT([lmu2png],[1.2],
+AC_INIT([lmu2png],[2.0],
 	[https://github.com/EasyRPG/Tools/issues],[lmu2png],[https://easyrpg.org/])
 
 AC_CONFIG_AUX_DIR([.])

lmu2png/configure.ac

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <FreeImage.h>
-#include "main.h"
+#include "utils.h"
 
 constexpr int TILE_SIZE=16;
 constexpr int HALF_TILE=TILE_SIZE/2;