diff --git a/.gitignore b/.gitignore index 74024cb..a169f41 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,10 @@ build/ CMakeUserPresets.json QFO2Tool msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/config\\msk2bmpGUI.cfg +cmake_install.cmake +CMakeFiles +Makefile +CMakeCache.txt +_deps + +msk2bmpGUI diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 77fd051..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/SDL_image"] - path = msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/SDL_image - url = git@github.com:libsdl-org/SDL_image.git diff --git a/CMakeLists.txt b/CMakeLists.txt index b0c9093..a8bfbc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,164 +1,61 @@ -cmake_minimum_required(VERSION 3.25) -set(CMAKE_MODULE_PATH ${EAO_CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}) - -set(PROJECT_NAME "QFO2Solution") - -project(${PROJECT_NAME} VERSION 0.0.1 - DESCRIPTION "${PROJECT_NAME}" -) -set(EXECUTABLE_NAME "QFO2Tool") -add_executable(${EXECUTABLE_NAME}) - -# Windows compile stuff? -if (CMAKE_SYSTEM_NAME STREQUAL "Windows") - -target_compile_definitions( - ${EXECUTABLE_NAME} - PUBLIC QFO2_WINDOWS -) - - -# Linux compile stuff? -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") - -target_compile_definitions( - ${EXECUTABLE_NAME} - PUBLIC QFO2_LINUX -) - -endif() - - -# I was wrong, this is fine as well as the target way, this will set default -# for all the target that doesn't specify for themself +cmake_minimum_required (VERSION 3.14) + +# --- Google Test ------------------------------------------------------------- +# GoogleTest requires at least C++14, but we need 17 for std::filesystem set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED TRUE) -set(CMAKE_CXX_EXTENSIONS FALSE) - -#target_compile_features(${EXECUTABLE_NAME} PUBLIC cxx_std_17) # requires minimum C++17 -#set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_EXTENSIONS FALSE) - - -# PRIVATE here is different than the others, usually i don't know what is this -# so ... read the book? -target_sources( - ${EXECUTABLE_NAME} PRIVATE +set(CMAKE_CXX_STANDARD_REQUIRED ON) - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/B_Endian.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/B_Endian.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/display_FRM_OpenGL.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/display_FRM_OpenGL.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Animation.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Animation.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Image.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Image.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Animate.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Animate.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Convert.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Convert.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image_Render.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image_Render.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image2Texture.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image2Texture.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Animation.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Animation.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Files.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Files.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/load_FRM_OpenGL.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/load_FRM_OpenGL.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Settings.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Settings.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/MSK_Convert.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/MSK_Convert.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Palette_Cycle.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Palette_Cycle.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Image.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Image.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Tiles.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Tiles.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Save_Files.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Save_Files.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/shader_class.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/shader_class.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/tinyfiledialogs/tinyfiledialogs.c - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/tinyfiledialogs/tinyfiledialogs.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Zoom_Pan.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Zoom_Pan.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/platform_io.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/platform_io.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/timer_functions.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/timer_functions.cpp - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_TILES_LST.h - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_TILES_LST.cpp +include(FetchContent) +FetchContent_Declare( + googletest + URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip +) +# For Windows: Prevent overriding the parent project's compiler/linker settings +set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) +FetchContent_MakeAvailable(googletest) +# ------------------------------------------------------------------------------ + +project(msk2bmpGUI + LANGUAGES CXX C + VERSION 1.0.0 ) -# There are a few way to get a dependecy, we will go though a few of them. - -# the SYSTEM parameter indicate the library is a system library which -# tell the compiler to not run certain static analysis like warnings -# because as library users we tent not to modify other people library. -# g++ notice -isystem instead of -I - -# We write CMakeLists.txt ourself, usually this is not recommended because -# it's is not the library users responsiblity to mantain build scripts. -# but since glad, imgui is a simple drop in library, it is trivial -# Writing CMakeLists.txt ourself usually the last resort when it comes to libraries -# that doesn't care to support cmake. -add_subdirectory(msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD SYSTEM) -add_subdirectory(msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking SYSTEM) -add_subdirectory(msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/SDL_image SYSTEM) - -# find_package try to find and run on FindXXX.cmake, XXXConfig.cmake, XXX-config.cmake -# which has script that instruct how to link and include a library, usually these script -# are mantain by Linux distribute package manager, Kitware, or library author. experience may vary -# SDL2 cmake script sucks, but at least FindSDL2.cmake isn't too bad, we use this to find -# installed linux package. -# if a package or component is REQUIRED then the script will raise error and stop executing -# instead of keep going -find_package(SDL2 REQUIRED COMPONENTS SDL2) -# find_package(SDL2_image REQUIRED) +add_executable(msk2bmpGUI ./src/msk2bmpGUI.cpp) +# ------------------------------------------------------------------------------ +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") -# One other way, use external package manager like conan and vcpgk -# they are other can of worms, which sometime can be useful but setting them -# up could be a little complicated. +find_package(SDL2 REQUIRED) +find_package(SDL2_image REQUIRED) -# One otherway that we could build the library ourself outside of this probject -# and set variable to their path so find_package could do the linking work for us. -# or we could link .a files, and include directories ourself, a little bit -# hacky IMO. +include_directories(${SDL2_INCLUDE_DIRS}) +include_directories(${SDL2_IMAGE_INCLUDE_DIRS}) +# ------------------------------------------------------------------------------ -# finally we link these libraries to our executable -# PRIVATE because nothing (target) going to depends on our executable -target_link_libraries( - ${EXECUTABLE_NAME} - PRIVATE - glad - imgui_docking - SDL2_image - SDL2::SDL2 -) +add_subdirectory(./specs) +add_subdirectory(./src/msk2bmp) +add_subdirectory(./dependencies/GLAD) +#add_subdirectory(./dependencies/GLFW) +add_subdirectory(./dependencies/imgui-docking) +add_subdirectory(./dependencies/tinyfiledialogs) -add_custom_command( - TARGET ${EXECUTABLE_NAME} PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory - $/resources/shaders - COMMAND ${CMAKE_COMMAND} -E make_directory - $/resources/palette +target_include_directories(msk2bmpGUI PUBLIC + src/msk2bmp + ./dependencies/GLAD + # ./dependencies/GLFW + ./dependencies/imgui-docking + ./dependencies/tinyfiledialogs ) -add_custom_command(TARGET ${EXECUTABLE_NAME} PRE_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_CURRENT_SOURCE_DIR}/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders - $/resources/shaders +target_link_libraries(msk2bmpGUI + PUBLIC msk2bmp + PUBLIC glad + PUBLIC imgui_docking + PUBLIC tinyfiledialogs + ${SDL2_LIBRARIES} + ${SDL2_IMAGE_LIBRARIES} - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_CURRENT_SOURCE_DIR}/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/palette - $/resources/palette ) -# I won't go into install script because i don't know how to properly do it -# and haven't had the need to know that yet. \ No newline at end of file diff --git a/README.md b/README.md index 2d42949..9988fbc 100644 --- a/README.md +++ b/README.md @@ -170,12 +170,10 @@ if it does take a while to actually get them built :) ## *Build* These packages are used in the build process: -GLAD +you'll need to install libsdl2-dev and libsdl2-image-dev +these libraries are all embedded: +GLAD GLFW - -SDL_image @ d3c6d59 ---- this is a git submodule, will have to "git submodule init", then "git submodule update" - imgui-docking - tinyfiledialogs diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake new file mode 100644 index 0000000..edc9664 --- /dev/null +++ b/cmake/FindSDL2.cmake @@ -0,0 +1,200 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +#.rst: +# FindSDL2 +# ------- +# +# Locate SDL2 library +# +# This module defines +# +# :: +# +# SDL2_LIBRARY, the name of the library to link against +# SDL2_FOUND, if false, do not try to link to SDL +# SDL2_INCLUDE_DIR, where to find SDL.h +# SDL2_VERSION_STRING, human-readable string containing the version of SDL +# +# +# +# This module responds to the flag: +# +# :: +# +# SDL2_BUILDING_LIBRARY +# If this is defined, then no SDL2_main will be linked in because +# only applications need main(). +# Otherwise, it is assumed you are building an application and this +# module will attempt to locate and set the proper link flags +# as part of the returned SDL2_LIBRARY variable. +# +# +# +# Don't forget to include SDLmain.h and SDLmain.m your project for the +# OS X framework based version. (Other versions link to -lSDL2main which +# this module will try to find on your behalf.) Also for OS X, this +# module will automatically add the -framework Cocoa on your behalf. +# +# +# +# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your +# configuration and no SDL2_LIBRARY, it means CMake did not find your SDL +# library (SDL.dll, libsdl.so, SDL.framework, etc). Set +# SDL2_LIBRARY_TEMP to point to your SDL library, and configure again. +# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this +# value as appropriate. These values are used to generate the final +# SDL2_LIBRARY variable, but when these values are unset, SDL2_LIBRARY +# does not get created. +# +# +# +# $SDL2DIR is an environment variable that would correspond to the +# ./configure --prefix=$SDL2DIR used in building SDL. l.e.galup 9-20-02 +# +# Modified by Eric Wing. Added code to assist with automated building +# by using environmental variables and providing a more +# controlled/consistent search behavior. Added new modifications to +# recognize OS X frameworks and additional Unix paths (FreeBSD, etc). +# Also corrected the header search path to follow "proper" SDL +# guidelines. Added a search for SDL2main which is needed by some +# platforms. Added a search for threads which is needed by some +# platforms. Added needed compile switches for MinGW. +# +# On OSX, this will prefer the Framework version (if found) over others. +# People will have to manually change the cache values of SDL2_LIBRARY to +# override this selection or set the CMake environment +# CMAKE_INCLUDE_PATH to modify the search paths. +# +# Note that the header path has changed from SDL/SDL.h to just SDL.h +# This needed to change because "proper" SDL convention is #include +# "SDL.h", not . This is done for portability reasons +# because not all systems place things in SDL/ (see FreeBSD). + +if(NOT SDL2_DIR) + set(SDL2_DIR "" CACHE PATH "SDL2 directory") +endif() + +find_path(SDL2_INCLUDE_DIR SDL.h + HINTS + ENV SDL2DIR + ${SDL2_DIR} + PATH_SUFFIXES SDL2 + # path suffixes to search inside ENV{SDL2DIR} + include/SDL2 include +) + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(VC_LIB_PATH_SUFFIX lib/x64) +else() + set(VC_LIB_PATH_SUFFIX lib/x86) +endif() + +find_library(SDL2_LIBRARY_TEMP + NAMES SDL2 + HINTS + ENV SDL2DIR + ${SDL2_DIR} + PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} +) + +# Hide this cache variable from the user, it's an internal implementation +# detail. The documented library variable for the user is SDL2_LIBRARY +# which is derived from SDL2_LIBRARY_TEMP further below. +set_property(CACHE SDL2_LIBRARY_TEMP PROPERTY TYPE INTERNAL) + +if(NOT SDL2_BUILDING_LIBRARY) + if(NOT SDL2_INCLUDE_DIR MATCHES ".framework") + # Non-OS X framework versions expect you to also dynamically link to + # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms + # seem to provide SDL2main for compatibility even though they don't + # necessarily need it. + find_library(SDL2MAIN_LIBRARY + NAMES SDL2main + HINTS + ENV SDL2DIR + ${SDL2_DIR} + PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} + PATHS + /sw + /opt/local + /opt/csw + /opt + ) + endif() +endif() + +# SDL may require threads on your system. +# The Apple build may not need an explicit flag because one of the +# frameworks may already provide it. +# But for non-OSX systems, I will use the CMake Threads package. +if(NOT APPLE) + find_package(Threads) +endif() + +# MinGW needs an additional link flag, -mwindows +# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -mwindows +if(MINGW) + set(MINGW32_LIBRARY mingw32 "-mwindows" CACHE STRING "link flags for MinGW") +endif() + +if(SDL2_LIBRARY_TEMP) + # For SDL2main + if(SDL2MAIN_LIBRARY AND NOT SDL2_BUILDING_LIBRARY) + list(FIND SDL2_LIBRARY_TEMP "${SDL2MAIN_LIBRARY}" _SDL2_MAIN_INDEX) + if(_SDL2_MAIN_INDEX EQUAL -1) + set(SDL2_LIBRARY_TEMP "${SDL2MAIN_LIBRARY}" ${SDL2_LIBRARY_TEMP}) + endif() + unset(_SDL2_MAIN_INDEX) + endif() + + # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa. + # CMake doesn't display the -framework Cocoa string in the UI even + # though it actually is there if I modify a pre-used variable. + # I think it has something to do with the CACHE STRING. + # So I use a temporary variable until the end so I can set the + # "real" variable in one-shot. + if(APPLE) + set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa") + endif() + + # For threads, as mentioned Apple doesn't need this. + # In fact, there seems to be a problem if I used the Threads package + # and try using this line, so I'm just skipping it entirely for OS X. + if(NOT APPLE) + set(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) + endif() + + # For MinGW library + if(MINGW) + set(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP}) + endif() + + # Set the final string here so the GUI reflects the final state. + set(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found") +endif() + +if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL2_version.h") + file(STRINGS "${SDL2_INCLUDE_DIR}/SDL2_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL2_MAJOR_VERSION[ \t]+[0-9]+$") + file(STRINGS "${SDL2_INCLUDE_DIR}/SDL2_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL2_MINOR_VERSION[ \t]+[0-9]+$") + file(STRINGS "${SDL2_INCLUDE_DIR}/SDL2_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL2_PATCHLEVEL[ \t]+[0-9]+$") + string(REGEX REPLACE "^#define[ \t]+SDL2_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}") + string(REGEX REPLACE "^#define[ \t]+SDL2_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}") + string(REGEX REPLACE "^#define[ \t]+SDL2_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}") + set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH}) + unset(SDL2_VERSION_MAJOR_LINE) + unset(SDL2_VERSION_MINOR_LINE) + unset(SDL2_VERSION_PATCH_LINE) + unset(SDL2_VERSION_MAJOR) + unset(SDL2_VERSION_MINOR) + unset(SDL2_VERSION_PATCH) +endif() + +set(SDL2_LIBRARIES ${SDL2_LIBRARY} ${SDL2MAIN_LIBRARY}) +set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 + REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR + VERSION_VAR SDL2_VERSION_STRING) diff --git a/cmake/FindSDL2_image.cmake b/cmake/FindSDL2_image.cmake new file mode 100644 index 0000000..19cb2a9 --- /dev/null +++ b/cmake/FindSDL2_image.cmake @@ -0,0 +1,102 @@ +# Distributed under the OSI-approved BSD 3-Clause License. See accompanying +# file Copyright.txt or https://cmake.org/licensing for details. + +#.rst: +# FindSDL2_image +# ------------- +# +# Locate SDL2_image library +# +# This module defines: +# +# :: +# +# SDL2_IMAGE_LIBRARIES, the name of the library to link against +# SDL2_IMAGE_INCLUDE_DIRS, where to find the headers +# SDL2_IMAGE_FOUND, if false, do not try to link against +# SDL2_IMAGE_VERSION_STRING - human-readable string containing the +# version of SDL2_image +# +# +# +# For backward compatibility the following variables are also set: +# +# :: +# +# SDL2IMAGE_LIBRARY (same value as SDL2_IMAGE_LIBRARIES) +# SDL2IMAGE_INCLUDE_DIR (same value as SDL2_IMAGE_INCLUDE_DIRS) +# SDL2IMAGE_FOUND (same value as SDL2_IMAGE_FOUND) +# +# +# +# $SDLDIR is an environment variable that would correspond to the +# ./configure --prefix=$SDLDIR used in building SDL. +# +# Created by Eric Wing. This was influenced by the FindSDL.cmake +# module, but with modifications to recognize OS X frameworks and +# additional Unix paths (FreeBSD, etc). + +if(NOT SDL2_IMAGE_INCLUDE_DIR AND SDL2IMAGE_INCLUDE_DIR) + set(SDL2_IMAGE_INCLUDE_DIR ${SDL2IMAGE_INCLUDE_DIR} CACHE PATH "directory cache +entry initialized from old variable name") +endif() +find_path(SDL2_IMAGE_INCLUDE_DIR SDL_image.h + HINTS + ENV SDL2IMAGEDIR + ENV SDL2DIR + ${SDL2_DIR} + PATH_SUFFIXES SDL2 + # path suffixes to search inside ENV{SDL2DIR} + include/SDL2 include +) + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(VC_LIB_PATH_SUFFIX lib/x64) +else() + set(VC_LIB_PATH_SUFFIX lib/x86) +endif() + +if(NOT SDL2_IMAGE_LIBRARY AND SDL2IMAGE_LIBRARY) + set(SDL2_IMAGE_LIBRARY ${SDL2IMAGE_LIBRARY} CACHE FILEPATH "file cache entry +initialized from old variable name") +endif() +find_library(SDL2_IMAGE_LIBRARY + NAMES SDL2_image + HINTS + ENV SDL2IMAGEDIR + ENV SDL2DIR + ${SDL2_DIR} + PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX} +) + +if(SDL2_IMAGE_INCLUDE_DIR AND EXISTS "${SDL2_IMAGE_INCLUDE_DIR}/SDL2_image.h") + file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL2_image.h" SDL2_IMAGE_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL2_IMAGE_MAJOR_VERSION[ \t]+[0-9]+$") + file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL2_image.h" SDL2_IMAGE_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL2_IMAGE_MINOR_VERSION[ \t]+[0-9]+$") + file(STRINGS "${SDL2_IMAGE_INCLUDE_DIR}/SDL2_image.h" SDL2_IMAGE_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL2_IMAGE_PATCHLEVEL[ \t]+[0-9]+$") + string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_MAJOR "${SDL2_IMAGE_VERSION_MAJOR_LINE}") + string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_MINOR "${SDL2_IMAGE_VERSION_MINOR_LINE}") + string(REGEX REPLACE "^#define[ \t]+SDL2_IMAGE_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_IMAGE_VERSION_PATCH "${SDL2_IMAGE_VERSION_PATCH_LINE}") + set(SDL2_IMAGE_VERSION_STRING ${SDL2_IMAGE_VERSION_MAJOR}.${SDL2_IMAGE_VERSION_MINOR}.${SDL2_IMAGE_VERSION_PATCH}) + unset(SDL2_IMAGE_VERSION_MAJOR_LINE) + unset(SDL2_IMAGE_VERSION_MINOR_LINE) + unset(SDL2_IMAGE_VERSION_PATCH_LINE) + unset(SDL2_IMAGE_VERSION_MAJOR) + unset(SDL2_IMAGE_VERSION_MINOR) + unset(SDL2_IMAGE_VERSION_PATCH) +endif() + +set(SDL2_IMAGE_LIBRARIES ${SDL2_IMAGE_LIBRARY}) +set(SDL2_IMAGE_INCLUDE_DIRS ${SDL2_IMAGE_INCLUDE_DIR}) + +include(FindPackageHandleStandardArgs) + +FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2_image + REQUIRED_VARS SDL2_IMAGE_LIBRARIES SDL2_IMAGE_INCLUDE_DIRS + VERSION_VAR SDL2_IMAGE_VERSION_STRING) + +# for backward compatibility +set(SDL2IMAGE_LIBRARY ${SDL2_IMAGE_LIBRARIES}) +set(SDL2IMAGE_INCLUDE_DIR ${SDL2_IMAGE_INCLUDE_DIRS}) +set(SDL2IMAGE_FOUND ${SDL2_IMAGE_FOUND}) + +mark_as_advanced(SDL2_IMAGE_LIBRARY SDL2_IMAGE_INCLUDE_DIR) diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/config/msk2bmpGUI.cfg b/config/msk2bmpGUI.cfg similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/config/msk2bmpGUI.cfg rename to config/msk2bmpGUI.cfg diff --git a/dependencies/GLAD/.gitignore b/dependencies/GLAD/.gitignore new file mode 100644 index 0000000..96036c3 --- /dev/null +++ b/dependencies/GLAD/.gitignore @@ -0,0 +1 @@ +libglad.a diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD/CMakeLists.txt b/dependencies/GLAD/CMakeLists.txt similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD/CMakeLists.txt rename to dependencies/GLAD/CMakeLists.txt diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD/include/KHR/khrplatform.h b/dependencies/GLAD/include/KHR/khrplatform.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD/include/KHR/khrplatform.h rename to dependencies/GLAD/include/KHR/khrplatform.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD/include/glad/glad.h b/dependencies/GLAD/include/glad/glad.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD/include/glad/glad.h rename to dependencies/GLAD/include/glad/glad.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD/src/glad.c b/dependencies/GLAD/src/glad.c similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLAD/src/glad.c rename to dependencies/GLAD/src/glad.c diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLFW/include/GLFW/glfw3.h b/dependencies/GLFW/include/GLFW/glfw3.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLFW/include/GLFW/glfw3.h rename to dependencies/GLFW/include/GLFW/glfw3.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLFW/include/GLFW/glfw3native.h b/dependencies/GLFW/include/GLFW/glfw3native.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLFW/include/GLFW/glfw3native.h rename to dependencies/GLFW/include/GLFW/glfw3native.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLFW/lib/glfw3.lib b/dependencies/GLFW/lib/glfw3.lib similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLFW/lib/glfw3.lib rename to dependencies/GLFW/lib/glfw3.lib diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLFW/source/glfw-3.3.8.zip b/dependencies/GLFW/source/glfw-3.3.8.zip similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/GLFW/source/glfw-3.3.8.zip rename to dependencies/GLFW/source/glfw-3.3.8.zip diff --git a/dependencies/imgui-docking/.gitignore b/dependencies/imgui-docking/.gitignore new file mode 100644 index 0000000..10301e2 --- /dev/null +++ b/dependencies/imgui-docking/.gitignore @@ -0,0 +1 @@ +*.a diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/CMakeLists.txt b/dependencies/imgui-docking/CMakeLists.txt similarity index 78% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/CMakeLists.txt rename to dependencies/imgui-docking/CMakeLists.txt index 1c1211c..daf6dd9 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/CMakeLists.txt +++ b/dependencies/imgui-docking/CMakeLists.txt @@ -7,8 +7,16 @@ project( add_library(imgui_docking STATIC) -find_package(SDL2 REQUIRED COMPONENTS SDL2) -target_link_libraries( imgui_docking PUBLIC SDL2::SDL2 ) +find_package(SDL2 REQUIRED) +find_package(SDL2_image REQUIRED) + +include_directories(${SDL2_INCLUDE_DIRS}) +include_directories(${SDL2_IMAGE_INCLUDE_DIRS}) + +target_link_libraries( imgui_docking PUBLIC + ${SDL2_LIBRARIES} + ${SDL2_IMAGE_LIBRARIES} +) target_sources( imgui_docking PRIVATE @@ -44,4 +52,4 @@ target_include_directories( $ ) -# message("________-------"$) \ No newline at end of file +# message("________-------"$) diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/ImGui_SDL_Render.h b/dependencies/imgui-docking/include/ImGui_SDL_Render.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/ImGui_SDL_Render.h rename to dependencies/imgui-docking/include/ImGui_SDL_Render.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imconfig.h b/dependencies/imgui-docking/include/imconfig.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imconfig.h rename to dependencies/imgui-docking/include/imconfig.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui.h b/dependencies/imgui-docking/include/imgui.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui.h rename to dependencies/imgui-docking/include/imgui.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_impl_opengl3.h b/dependencies/imgui-docking/include/imgui_impl_opengl3.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_impl_opengl3.h rename to dependencies/imgui-docking/include/imgui_impl_opengl3.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_impl_opengl3_loader.h b/dependencies/imgui-docking/include/imgui_impl_opengl3_loader.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_impl_opengl3_loader.h rename to dependencies/imgui-docking/include/imgui_impl_opengl3_loader.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_impl_sdl.h b/dependencies/imgui-docking/include/imgui_impl_sdl.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_impl_sdl.h rename to dependencies/imgui-docking/include/imgui_impl_sdl.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_impl_sdlrenderer.h b/dependencies/imgui-docking/include/imgui_impl_sdlrenderer.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_impl_sdlrenderer.h rename to dependencies/imgui-docking/include/imgui_impl_sdlrenderer.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_internal.h b/dependencies/imgui-docking/include/imgui_internal.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imgui_internal.h rename to dependencies/imgui-docking/include/imgui_internal.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imstb_rectpack.h b/dependencies/imgui-docking/include/imstb_rectpack.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imstb_rectpack.h rename to dependencies/imgui-docking/include/imstb_rectpack.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imstb_textedit.h b/dependencies/imgui-docking/include/imstb_textedit.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imstb_textedit.h rename to dependencies/imgui-docking/include/imstb_textedit.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imstb_truetype.h b/dependencies/imgui-docking/include/imstb_truetype.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/include/imstb_truetype.h rename to dependencies/imgui-docking/include/imstb_truetype.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/ImGui_SDL_Render.cpp b/dependencies/imgui-docking/src/ImGui_SDL_Render.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/ImGui_SDL_Render.cpp rename to dependencies/imgui-docking/src/ImGui_SDL_Render.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui.cpp b/dependencies/imgui-docking/src/imgui.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui.cpp rename to dependencies/imgui-docking/src/imgui.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_demo.cpp b/dependencies/imgui-docking/src/imgui_demo.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_demo.cpp rename to dependencies/imgui-docking/src/imgui_demo.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_draw.cpp b/dependencies/imgui-docking/src/imgui_draw.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_draw.cpp rename to dependencies/imgui-docking/src/imgui_draw.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_impl_opengl3.cpp b/dependencies/imgui-docking/src/imgui_impl_opengl3.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_impl_opengl3.cpp rename to dependencies/imgui-docking/src/imgui_impl_opengl3.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_impl_sdl.cpp b/dependencies/imgui-docking/src/imgui_impl_sdl.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_impl_sdl.cpp rename to dependencies/imgui-docking/src/imgui_impl_sdl.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_impl_sdlrenderer.cpp b/dependencies/imgui-docking/src/imgui_impl_sdlrenderer.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_impl_sdlrenderer.cpp rename to dependencies/imgui-docking/src/imgui_impl_sdlrenderer.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_tables.cpp b/dependencies/imgui-docking/src/imgui_tables.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_tables.cpp rename to dependencies/imgui-docking/src/imgui_tables.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_widgets.cpp b/dependencies/imgui-docking/src/imgui_widgets.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/imgui-docking/src/imgui_widgets.cpp rename to dependencies/imgui-docking/src/imgui_widgets.cpp diff --git a/dependencies/tinyfiledialogs/.gitignore b/dependencies/tinyfiledialogs/.gitignore new file mode 100644 index 0000000..10301e2 --- /dev/null +++ b/dependencies/tinyfiledialogs/.gitignore @@ -0,0 +1 @@ +*.a diff --git a/dependencies/tinyfiledialogs/CMakeLists.txt b/dependencies/tinyfiledialogs/CMakeLists.txt new file mode 100644 index 0000000..a0021d1 --- /dev/null +++ b/dependencies/tinyfiledialogs/CMakeLists.txt @@ -0,0 +1,4 @@ +add_library(tinyfiledialogs + tinyfiledialogs.c + tinyfiledialogs.h +) diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/tinyfiledialogs/tinyfiledialogs.c b/dependencies/tinyfiledialogs/tinyfiledialogs.c similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/tinyfiledialogs/tinyfiledialogs.c rename to dependencies/tinyfiledialogs/tinyfiledialogs.c diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/tinyfiledialogs/tinyfiledialogs.h b/dependencies/tinyfiledialogs/tinyfiledialogs.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/tinyfiledialogs/tinyfiledialogs.h rename to dependencies/tinyfiledialogs/tinyfiledialogs.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/BARREL.FRM b/images/BARREL.FRM similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/BARREL.FRM rename to images/BARREL.FRM diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/HANPWRAB.FRM b/images/HANPWRAB.FRM similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/HANPWRAB.FRM rename to images/HANPWRAB.FRM diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/HANPWRAK.FRM b/images/HANPWRAK.FRM similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/HANPWRAK.FRM rename to images/HANPWRAK.FRM diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/HANPWRAL.FRM b/images/HANPWRAL.FRM similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/HANPWRAL.FRM rename to images/HANPWRAL.FRM diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/HMJMPSNA.FRM b/images/HMJMPSNA.FRM similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/HMJMPSNA.FRM rename to images/HMJMPSNA.FRM diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/Hypnotoad_banner.jpg b/images/Hypnotoad_banner.jpg similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/Hypnotoad_banner.jpg rename to images/Hypnotoad_banner.jpg diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/MONITR7.FRM b/images/MONITR7.FRM similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/MONITR7.FRM rename to images/MONITR7.FRM diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/New World Map 1000x1000.png b/images/New World Map 1000x1000.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/New World Map 1000x1000.png rename to images/New World Map 1000x1000.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/New World Map 1001x1000.png b/images/New World Map 1001x1000.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/New World Map 1001x1000.png rename to images/New World Map 1001x1000.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/New World Map 1001x1001.png b/images/New World Map 1001x1001.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/New World Map 1001x1001.png rename to images/New World Map 1001x1001.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/New World Map.png b/images/New World Map.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/New World Map.png rename to images/New World Map.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/dithering test (400x400).png b/images/dithering test (400x400).png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/dithering test (400x400).png rename to images/dithering test (400x400).png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/dithering test (401x401).png b/images/dithering test (401x401).png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/dithering test (401x401).png rename to images/dithering test (401x401).png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/dithering test (401x403).png b/images/dithering test (401x403).png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/dithering test (401x403).png rename to images/dithering test (401x403).png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/dithering test (402x402).png b/images/dithering test (402x402).png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/dithering test (402x402).png rename to images/dithering test (402x402).png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/floor-design-home-design.png b/images/floor-design-home-design.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/floor-design-home-design.png rename to images/floor-design-home-design.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/scr00000.png b/images/scr00000.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/scr00000.png rename to images/scr00000.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/tBOSSSBF1.FRM b/images/tBOSSSBF1.FRM similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/tBOSSSBF1.FRM rename to images/tBOSSSBF1.FRM diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/wrldmp00.FRM b/images/wrldmp00.FRM similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/wrldmp00.FRM rename to images/wrldmp00.FRM diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/wrldmp00.MSK b/images/wrldmp00.MSK similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/images/wrldmp00.MSK rename to images/wrldmp00.MSK diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100644 index 0000000..10301e2 --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1 @@ +*.a diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.psess b/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.psess deleted file mode 100644 index 2383d2f..0000000 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.psess +++ /dev/null @@ -1,80 +0,0 @@ - - - - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.sln - Instrumentation - None - true - true - Timestamp - Cycles - 10000000 - 10 - 10 - - false - - - - false - 500 - - \Memory\Pages/sec - \PhysicalDisk(_Total)\Avg. Disk Queue Length - \Processor(_Total)\% Processor Time - - - - true - false - false - - false - - - false - - - - Debug\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.exe - 01/01/0001 00:00:00 - true - true - false - false - false - false - false - true - false - Executable - Debug\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.exe - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\ - - - IIS - InternetExplorer - true - false - - false - - - false - - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}|msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs - - - - - msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs220823.vsp - - - - - :PB:{C8648FE9-A07D-4025-9479-7AF4BCBF6394}|msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj - - - \ No newline at end of file diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.sln b/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.sln deleted file mode 100644 index c61a698..0000000 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.sln +++ /dev/null @@ -1,34 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.1525 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs", "msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj", "{C8648FE9-A07D-4025-9479-7AF4BCBF6394}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}.Debug|x64.ActiveCfg = Debug|x64 - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}.Debug|x64.Build.0 = Debug|x64 - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}.Debug|x86.ActiveCfg = Debug|Win32 - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}.Debug|x86.Build.0 = Debug|Win32 - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}.Release|x64.ActiveCfg = Release|x64 - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}.Release|x64.Build.0 = Release|x64 - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}.Release|x86.ActiveCfg = Release|Win32 - {C8648FE9-A07D-4025-9479-7AF4BCBF6394}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E241AE1F-824A-47FA-B7B2-AC9C3022E58B} - EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection -EndGlobal diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/README.md b/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/README.md deleted file mode 100644 index 304521d..0000000 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/README.md +++ /dev/null @@ -1 +0,0 @@ -This is my first readme file... diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/SDL_image b/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/SDL_image deleted file mode 160000 index d3c6d59..0000000 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/dependencies/SDL_image +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d3c6d5963dbe438bcae0e2b6f3d7cfea23d02829 diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/git help --all.txt b/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/git help --all.txt deleted file mode 100644 index 8dd48b0..0000000 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/git help --all.txt +++ /dev/null @@ -1,169 +0,0 @@ -See 'git help ' to read about a specific subcommand - -Main Porcelain Commands - add Add file contents to the index - am Apply a series of patches from a mailbox - archive Create an archive of files from a named tree - bisect Use binary search to find the commit that introduced a bug - branch List, create, or delete branches - bundle Move objects and refs by archive - checkout Switch branches or restore working tree files - cherry-pick Apply the changes introduced by some existing commits - citool Graphical alternative to git-commit - clean Remove untracked files from the working tree - clone Clone a repository into a new directory - commit Record changes to the repository - describe Give an object a human readable name based on an available ref - diff Show changes between commits, commit and working tree, etc - fetch Download objects and refs from another repository - format-patch Prepare patches for e-mail submission - gc Cleanup unnecessary files and optimize the local repository - gitk The Git repository browser - grep Print lines matching a pattern - gui A portable graphical interface to Git - init Create an empty Git repository or reinitialize an existing one - log Show commit logs - maintenance Run tasks to optimize Git repository data - merge Join two or more development histories together - mv Move or rename a file, a directory, or a symlink - notes Add or inspect object notes - pull Fetch from and integrate with another repository or a local branch - push Update remote refs along with associated objects - range-diff Compare two commit ranges (e.g. two versions of a branch) - rebase Reapply commits on top of another base tip - reset Reset current HEAD to the specified state - restore Restore working tree files - revert Revert some existing commits - rm Remove files from the working tree and from the index - shortlog Summarize 'git log' output - show Show various types of objects - sparse-checkout Initialize and modify the sparse-checkout - stash Stash the changes in a dirty working directory away - status Show the working tree status - submodule Initialize, update or inspect submodules - switch Switch branches - tag Create, list, delete or verify a tag object signed with GPG - worktree Manage multiple working trees - -Ancillary Commands / Manipulators - config Get and set repository or global options - fast-export Git data exporter - fast-import Backend for fast Git data importers - filter-branch Rewrite branches - mergetool Run merge conflict resolution tools to resolve merge conflicts - pack-refs Pack heads and tags for efficient repository access - prune Prune all unreachable objects from the object database - reflog Manage reflog information - remote Manage set of tracked repositories - repack Pack unpacked objects in a repository - replace Create, list, delete refs to replace objects - -Ancillary Commands / Interrogators - annotate Annotate file lines with commit information - blame Show what revision and author last modified each line of a file - bugreport Collect information for user to file a bug report - count-objects Count unpacked number of objects and their disk consumption - difftool Show changes using common diff tools - fsck Verifies the connectivity and validity of the objects in the database - gitweb Git web interface (web frontend to Git repositories) - help Display help information about Git - instaweb Instantly browse your working repository in gitweb - merge-tree Show three-way merge without touching index - rerere Reuse recorded resolution of conflicted merges - show-branch Show branches and their commits - verify-commit Check the GPG signature of commits - verify-tag Check the GPG signature of tags - whatchanged Show logs with difference each commit introduces - -Interacting with Others - archimport Import a GNU Arch repository into Git - cvsexportcommit Export a single commit to a CVS checkout - cvsimport Salvage your data out of another SCM people love to hate - cvsserver A CVS server emulator for Git - imap-send Send a collection of patches from stdin to an IMAP folder - p4 Import from and submit to Perforce repositories - quiltimport Applies a quilt patchset onto the current branch - request-pull Generates a summary of pending changes - send-email Send a collection of patches as emails - svn Bidirectional operation between a Subversion repository and Git - -Low-level Commands / Manipulators - apply Apply a patch to files and/or to the index - checkout-index Copy files from the index to the working tree - commit-graph Write and verify Git commit-graph files - commit-tree Create a new commit object - hash-object Compute object ID and optionally creates a blob from a file - index-pack Build pack index file for an existing packed archive - merge-file Run a three-way file merge - merge-index Run a merge for files needing merging - mktag Creates a tag object with extra validation - mktree Build a tree-object from ls-tree formatted text - multi-pack-index Write and verify multi-pack-indexes - pack-objects Create a packed archive of objects - prune-packed Remove extra objects that are already in pack files - read-tree Reads tree information into the index - symbolic-ref Read, modify and delete symbolic refs - unpack-objects Unpack objects from a packed archive - update-index Register file contents in the working tree to the index - update-ref Update the object name stored in a ref safely - write-tree Create a tree object from the current index - -Low-level Commands / Interrogators - cat-file Provide content or type and size information for repository objects - cherry Find commits yet to be applied to upstream - diff-files Compares files in the working tree and the index - diff-index Compare a tree to the working tree or index - diff-tree Compares the content and mode of blobs found via two tree objects - for-each-ref Output information on each ref - for-each-repo Run a Git command on a list of repositories - get-tar-commit-id Extract commit ID from an archive created using git-archive - ls-files Show information about files in the index and the working tree - ls-remote List references in a remote repository - ls-tree List the contents of a tree object - merge-base Find as good common ancestors as possible for a merge - name-rev Find symbolic names for given revs - pack-redundant Find redundant pack files - rev-list Lists commit objects in reverse chronological order - rev-parse Pick out and massage parameters - show-index Show packed archive index - show-ref List references in a local repository - unpack-file Creates a temporary file with a blob's contents - var Show a Git logical variable - verify-pack Validate packed Git archive files - -Low-level Commands / Syncing Repositories - daemon A really simple server for Git repositories - fetch-pack Receive missing objects from another repository - http-backend Server side implementation of Git over HTTP - send-pack Push objects over Git protocol to another repository - update-server-info Update auxiliary info file to help dumb servers - -Low-level Commands / Internal Helpers - check-attr Display gitattributes information - check-ignore Debug gitignore / exclude files - check-mailmap Show canonical names and email addresses of contacts - check-ref-format Ensures that a reference name is well formed - column Display data in columns - credential Retrieve and store user credentials - credential-cache Helper to temporarily store passwords in memory - credential-store Helper to store credentials on disk - fmt-merge-msg Produce a merge commit message - interpret-trailers Add or parse structured information in commit messages - mailinfo Extracts patch and authorship from a single e-mail message - mailsplit Simple UNIX mbox splitter program - merge-one-file The standard helper program to use with git-merge-index - patch-id Compute unique ID for a patch - sh-i18n Git's i18n setup code for shell scripts - sh-setup Common Git shell script setup code - stripspace Remove unnecessary whitespace - -External commands - askpass - askyesno - credential-helper-selector - flow - lfs - update-git-for-windows - -Command aliases - lg log --graph --pretty=format:'%C(yellow)%h%Cred%d%Creset %Cgreen(%cr)%Creset%n%n %s %C(bold blue)<%an>%n' --date=relative diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj b/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj deleted file mode 100644 index 9ae68c3..0000000 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj +++ /dev/null @@ -1,258 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {C8648FE9-A07D-4025-9479-7AF4BCBF6394} - msk2bmpGUICCimguisdl2tinyfiledialogs - 10.0.17763.0 - - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - Application - true - v141 - MultiByte - - - Application - false - v141 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\dependencies\GLFW\include;C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\dependencies\GLAD\include;C:\Users\Destructor\C Programming in 21 Days\SDL2_image-2.0.5\include;C:\Users\Destructor\C Programming in 21 Days\SDL2-2.0.20\include;$(IncludePath) - C:\Users\Destructor\C Programming in 21 Days\SDL2_image-2.0.5\lib\x86;C:\Users\Destructor\C Programming in 21 Days\SDL2-2.0.20\lib\x86;C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\dependencies\GLAD;C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\dependencies\GLFW;$(LibraryPath) - Qs Beta Fallout Image Editor Debug - - - C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\dependencies\GLFW\include;C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\dependencies\GLAD\include;C:\Users\Destructor\C Programming in 21 Days\SDL2_image-2.0.5\include;C:\Users\Destructor\C Programming in 21 Days\SDL2-2.0.20\include;$(IncludePath) - C:\Users\Destructor\C Programming in 21 Days\SDL2_image-2.0.5\lib\x86;C:\Users\Destructor\C Programming in 21 Days\SDL2-2.0.20\lib\x86;C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\dependencies\GLAD;C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\dependencies\GLFW;$(LibraryPath) - Qs Beta Fallout Image Editor - - - C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\glad\include;C:\Users\Destructor\C Programming in 21 Days\SDL2_image-2.0.5\include;C:\Users\Destructor\C Programming in 21 Days\SDL2-2.0.20\include;$(IncludePath) - C:\Users\Destructor\C Programming in 21 Days\SDL2_image-2.0.5\lib\x86;C:\Users\Destructor\C Programming in 21 Days\SDL2-2.0.20\lib\x86;C:\Users\Destructor\C Programming in 21 Days\glad;$(LibraryPath) - - - C:\Users\Destructor\C Programming in 21 Days\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs\glad\include;C:\Users\Destructor\C Programming in 21 Days\SDL2_image-2.0.5\include;C:\Users\Destructor\C Programming in 21 Days\SDL2-2.0.20\include;$(IncludePath) - C:\Users\Destructor\C Programming in 21 Days\SDL2_image-2.0.5\lib\x86;C:\Users\Destructor\C Programming in 21 Days\SDL2-2.0.20\lib\x86;C:\Users\Destructor\C Programming in 21 Days\glad;$(LibraryPath) - - - - Level3 - Disabled - true - _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - stdcpp17 - - - Console - SDL2_image.lib;SDL2.lib;opengl32.lib;%(AdditionalDependencies) - true - - - - - - - - - - - xcopy /s /y "$(ProjectDir)resources" "$(OutDir)resources" /i - - - SomeNonExistantFileNameToForceVSToRunBuildSteps - - - - - Level3 - Disabled - true - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - stdcpp17 - - - Console - SDL2_image.lib;SDL2.lib;SDL2main.lib;opengl32.lib;%(AdditionalDependencies) - true - - - - - Level3 - MaxSpeed - true - true - true - _CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) - stdcpp17 - - - Console - true - true - SDL2_image.lib;SDL2.lib;opengl32.lib;%(AdditionalDependencies) - - - - - - - - - - - xcopy /s /y "$(ProjectDir)resources" "$(OutDir)resources" /i - - - SomeNonExistantFileNameToForceVSToRunBuildSteps - - - - - Level3 - MaxSpeed - true - true - true - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - stdcpp17 - - - Console - true - true - SDL2_image.lib;SDL2.lib;SDL2main.lib;opengl32.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - \ No newline at end of file diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj.filters b/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj.filters deleted file mode 100644 index 21342ab..0000000 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj.filters +++ /dev/null @@ -1,236 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {7c94c1f2-0c93-4599-9c50-94ff8e1a9127} - - - {b833a7f1-20bb-4600-b1d6-7f6f38d06701} - - - {53b58c10-480a-4117-981d-daa7d99c3e11} - - - {cc314f19-68c8-4331-9347-75dff9713c25} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\OpenGL\Image2Texture - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\OpenGL\FRM - - - Source Files\OpenGL\FRM - - - Source Files\OpenGL\FRM - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\OpenGL - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\imgui-docking - - - Source Files\OpenGL\Image2Texture - - - Header Files - - - Header Files - - - Header Files - - - Source Files\OpenGL\FRM - - - Source Files\OpenGL\FRM - - - Source Files\OpenGL\FRM - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Resource Files - - - Source Files\OpenGL\FRM - - - Source Files\OpenGL\FRM - - - Source Files\OpenGL\FRM - - - Source Files\OpenGL\FRM - - - \ No newline at end of file diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj.user b/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj.user deleted file mode 100644 index 28e4fc5..0000000 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs.vcxproj.user +++ /dev/null @@ -1,18 +0,0 @@ - - - - false - - - $(ProjectDir) - WindowsLocalDebugger - - - - - $(ProjectDir) - WindowsLocalDebugger - - - - \ No newline at end of file diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/blue tile square.png b/resources/blue tile square.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/blue tile square.png rename to resources/blue tile square.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/blue_tile_mask.png b/resources/blue_tile_mask.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/blue_tile_mask.png rename to resources/blue_tile_mask.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/fonts/OpenSans-Bold.ttf b/resources/fonts/OpenSans-Bold.ttf similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/fonts/OpenSans-Bold.ttf rename to resources/fonts/OpenSans-Bold.ttf diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/fonts/OpenSans-BoldItalic.ttf b/resources/fonts/OpenSans-BoldItalic.ttf similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/fonts/OpenSans-BoldItalic.ttf rename to resources/fonts/OpenSans-BoldItalic.ttf diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/grid-texture.png b/resources/grid-texture.png similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/grid-texture.png rename to resources/grid-texture.png diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/SDL2.dll b/resources/libs/SDL2.dll similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/SDL2.dll rename to resources/libs/SDL2.dll diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/SDL2_image.dll b/resources/libs/SDL2_image.dll similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/SDL2_image.dll rename to resources/libs/SDL2_image.dll diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/libjpeg-9.dll b/resources/libs/libjpeg-9.dll similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/libjpeg-9.dll rename to resources/libs/libjpeg-9.dll diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/libpng16-16.dll b/resources/libs/libpng16-16.dll similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/libpng16-16.dll rename to resources/libs/libpng16-16.dll diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/libtiff-5.dll b/resources/libs/libtiff-5.dll similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/libtiff-5.dll rename to resources/libs/libtiff-5.dll diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/libwebp-7.dll b/resources/libs/libwebp-7.dll similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/libwebp-7.dll rename to resources/libs/libwebp-7.dll diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/zlib1.dll b/resources/libs/zlib1.dll similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/libs/zlib1.dll rename to resources/libs/zlib1.dll diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/palette/color.pal b/resources/palette/color.pal similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/palette/color.pal rename to resources/palette/color.pal diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/palette/color.txt b/resources/palette/color.txt similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/palette/color.txt rename to resources/palette/color.txt diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/palette/fo_color.pal b/resources/palette/fo_color.pal similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/palette/fo_color.pal rename to resources/palette/fo_color.pal diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders/passthru_shader.frag b/resources/shaders/passthru_shader.frag similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders/passthru_shader.frag rename to resources/shaders/passthru_shader.frag diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders/passthru_shader.vert b/resources/shaders/passthru_shader.vert similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders/passthru_shader.vert rename to resources/shaders/passthru_shader.vert diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders/render_FRM.frag b/resources/shaders/render_FRM.frag similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders/render_FRM.frag rename to resources/shaders/render_FRM.frag diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders/render_PAL.frag b/resources/shaders/render_PAL.frag similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/resources/shaders/render_PAL.frag rename to resources/shaders/render_PAL.frag diff --git a/specs/.gitignore b/specs/.gitignore new file mode 100644 index 0000000..f21c8b6 --- /dev/null +++ b/specs/.gitignore @@ -0,0 +1,2 @@ +CMakeFiles +msk2bmpGUI_spec diff --git a/specs/CMakeLists.txt b/specs/CMakeLists.txt new file mode 100644 index 0000000..ea728aa --- /dev/null +++ b/specs/CMakeLists.txt @@ -0,0 +1,19 @@ +enable_testing() + +add_executable( + msk2bmpGUI_spec + hello_spec.cpp +) + +target_link_libraries( + msk2bmpGUI_spec PUBLIC + msk2bmp + GTest::gtest_main +) + +target_include_directories(msk2bmpGUI_spec PUBLIC + ../src/msk2bmp +) + +include(GoogleTest) +gtest_discover_tests(msk2bmpGUI_spec) diff --git a/specs/hello_spec.cpp b/specs/hello_spec.cpp new file mode 100644 index 0000000..9432d54 --- /dev/null +++ b/specs/hello_spec.cpp @@ -0,0 +1,10 @@ +#include + +// Demonstrate some basic assertions. +TEST(HelloTest, BasicAssertions) { + // Expect two strings not to be equal. + EXPECT_STRNE("hello", "world"); + // Expect equality. + EXPECT_EQ(7 * 6, 42); +} + diff --git a/src/msk2bmp/.gitignore b/src/msk2bmp/.gitignore new file mode 100644 index 0000000..8d577b5 --- /dev/null +++ b/src/msk2bmp/.gitignore @@ -0,0 +1,2 @@ +*.a +CMakeFiles diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/B_Endian.cpp b/src/msk2bmp/B_Endian.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/B_Endian.cpp rename to src/msk2bmp/B_Endian.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/B_Endian.h b/src/msk2bmp/B_Endian.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/B_Endian.h rename to src/msk2bmp/B_Endian.h diff --git a/src/msk2bmp/CMakeLists.txt b/src/msk2bmp/CMakeLists.txt new file mode 100644 index 0000000..23b2ab5 --- /dev/null +++ b/src/msk2bmp/CMakeLists.txt @@ -0,0 +1,73 @@ +add_library(msk2bmp + B_Endian.cpp + B_Endian.h + CMakeLists.txt + display_FRM_OpenGL.cpp + display_FRM_OpenGL.h + Edit_Animation.cpp + Edit_Animation.h + Edit_Image.cpp + Edit_Image.h + Edit_TILES_LST.cpp + Edit_TILES_LST.h + FRM_Animate.cpp + FRM_Animate.h + FRM_Convert.cpp + FRM_Convert.h + Image2Texture.cpp + Image2Texture.h + Image_Render.cpp + Image_Render.h + Load_Animation.cpp + Load_Animation.h + Load_Files.cpp + Load_Files.h + load_FRM_OpenGL.cpp + load_FRM_OpenGL.h + Load_Settings.cpp + Load_Settings.h + MSK_Convert.cpp + MSK_Convert.h + Palette_Cycle.cpp + Palette_Cycle.h + platform_io.cpp + platform_io.h + Preview_Image.cpp + Preview_Image.h + Preview_Tiles.cpp + Preview_Tiles.h + Save_Files.cpp + Save_Files.h + shader_class.cpp + shader_class.h + timer_functions.cpp + timer_functions.h + Zoom_Pan.cpp + Zoom_Pan.h +) + +target_include_directories(msk2bmp PUBLIC + ../../dependencies/GLAD/include + ../../dependencies/imgui-docking/include + ../../dependencies/tinyfiledialogs +) + +# Windows compile stuff? +if (CMAKE_SYSTEM_NAME STREQUAL "Windows") + +target_compile_definitions( + msk2bmp + PUBLIC QFO2_WINDOWS +) + +# Linux compile stuff? +elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") + +target_compile_definitions( + msk2bmp + PUBLIC QFO2_LINUX +) + +endif() + + diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Animation.cpp b/src/msk2bmp/Edit_Animation.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Animation.cpp rename to src/msk2bmp/Edit_Animation.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Animation.h b/src/msk2bmp/Edit_Animation.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Animation.h rename to src/msk2bmp/Edit_Animation.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Image.cpp b/src/msk2bmp/Edit_Image.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Image.cpp rename to src/msk2bmp/Edit_Image.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Image.h b/src/msk2bmp/Edit_Image.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_Image.h rename to src/msk2bmp/Edit_Image.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_TILES_LST.cpp b/src/msk2bmp/Edit_TILES_LST.cpp similarity index 99% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_TILES_LST.cpp rename to src/msk2bmp/Edit_TILES_LST.cpp index 97b847c..2504b34 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_TILES_LST.cpp +++ b/src/msk2bmp/Edit_TILES_LST.cpp @@ -1,10 +1,11 @@ #include +#include + #include "platform_io.h" #include "Load_Settings.h" #include "Save_Files.h" #include "Edit_TILES_LST.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" //malloc char* and populate with generated tile-names //return ptr (need to free elsewhere) @@ -749,4 +750,4 @@ void add_TMAP_tiles_to_lst(user_info* usr_nfo, char** new_tile_list, char* save_ free(usr_nfo->game_files.TILES_LST); } usr_nfo->game_files.TILES_LST = tiles_lst; -} \ No newline at end of file +} diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_TILES_LST.h b/src/msk2bmp/Edit_TILES_LST.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Edit_TILES_LST.h rename to src/msk2bmp/Edit_TILES_LST.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Animate.cpp b/src/msk2bmp/FRM_Animate.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Animate.cpp rename to src/msk2bmp/FRM_Animate.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Animate.h b/src/msk2bmp/FRM_Animate.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Animate.h rename to src/msk2bmp/FRM_Animate.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Convert.cpp b/src/msk2bmp/FRM_Convert.cpp similarity index 96% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Convert.cpp rename to src/msk2bmp/FRM_Convert.cpp index 7ef7f78..43d01c2 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Convert.cpp +++ b/src/msk2bmp/FRM_Convert.cpp @@ -1,7 +1,8 @@ +#include + #include "FRM_Convert.h" #include "FRM_Animate.h" #include "B_Endian.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" #include "Load_Files.h" #include diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Convert.h b/src/msk2bmp/FRM_Convert.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/FRM_Convert.h rename to src/msk2bmp/FRM_Convert.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image2Texture.cpp b/src/msk2bmp/Image2Texture.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image2Texture.cpp rename to src/msk2bmp/Image2Texture.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image2Texture.h b/src/msk2bmp/Image2Texture.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image2Texture.h rename to src/msk2bmp/Image2Texture.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image_Render.cpp b/src/msk2bmp/Image_Render.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image_Render.cpp rename to src/msk2bmp/Image_Render.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image_Render.h b/src/msk2bmp/Image_Render.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Image_Render.h rename to src/msk2bmp/Image_Render.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Animation.cpp b/src/msk2bmp/Load_Animation.cpp similarity index 96% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Animation.cpp rename to src/msk2bmp/Load_Animation.cpp index db4a51c..2ab1705 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Animation.cpp +++ b/src/msk2bmp/Load_Animation.cpp @@ -4,10 +4,11 @@ #include #include +#include + #include "Load_Files.h" #include "Load_Animation.h" #include "Edit_Animation.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" bool Drag_Drop_Load_Animation(std::vector & path_set, LF* F_Prop) @@ -348,4 +349,4 @@ void Gui_Video_Controls(image_data* img_data, img_type type) } ImGui::SetCursorPos(origin); -} \ No newline at end of file +} diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Animation.h b/src/msk2bmp/Load_Animation.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Animation.h rename to src/msk2bmp/Load_Animation.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Files.cpp b/src/msk2bmp/Load_Files.cpp similarity index 97% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Files.cpp rename to src/msk2bmp/Load_Files.cpp index e41d5b1..27cf014 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Files.cpp +++ b/src/msk2bmp/Load_Files.cpp @@ -15,12 +15,13 @@ #include #include +#include + #include "platform_io.h" #include "Load_Files.h" #include "Load_Animation.h" #include "Load_Settings.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" #include "Image2Texture.h" #include "FRM_Convert.h" #include "MSK_Convert.h" @@ -912,4 +913,4 @@ void load_tile_texture(GLuint *texture, char *file_name) // &F_Prop->edit_image_window); // } // } -// } \ No newline at end of file +// } diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Files.h b/src/msk2bmp/Load_Files.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Files.h rename to src/msk2bmp/Load_Files.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Settings.cpp b/src/msk2bmp/Load_Settings.cpp similarity index 96% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Settings.cpp rename to src/msk2bmp/Load_Settings.cpp index 6da19ec..00b9ba9 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Settings.cpp +++ b/src/msk2bmp/Load_Settings.cpp @@ -1,5 +1,6 @@ +#include + #include "Load_Settings.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" #include #include @@ -356,4 +357,4 @@ void write_cfg_file(struct user_info* usr_info, char* exe_path) fclose(config_file_ptr); -} \ No newline at end of file +} diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Settings.h b/src/msk2bmp/Load_Settings.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Load_Settings.h rename to src/msk2bmp/Load_Settings.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/MSK_Convert.cpp b/src/msk2bmp/MSK_Convert.cpp similarity index 96% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/MSK_Convert.cpp rename to src/msk2bmp/MSK_Convert.cpp index cc91b99..d7ca882 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/MSK_Convert.cpp +++ b/src/msk2bmp/MSK_Convert.cpp @@ -7,8 +7,9 @@ #include #include +#include + #include "MSK_Convert.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" // Windows BITMAPINFOHEADER format, for historical reasons uint8_t bmpHeader[62] = { diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/MSK_Convert.h b/src/msk2bmp/MSK_Convert.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/MSK_Convert.h rename to src/msk2bmp/MSK_Convert.h diff --git a/src/msk2bmp/Makefile b/src/msk2bmp/Makefile new file mode 100644 index 0000000..fae0ab0 --- /dev/null +++ b/src/msk2bmp/Makefile @@ -0,0 +1,798 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 3.29 + +# Default target executed when no arguments are given to make. +default_target: all +.PHONY : default_target + +# Allow only one "make -f Makefile2" at a time, but pass parallelism. +.NOTPARALLEL: + +#============================================================================= +# Special targets provided by cmake. + +# Disable implicit rules so canonical targets will work. +.SUFFIXES: + +# Disable VCS-based implicit rules. +% : %,v + +# Disable VCS-based implicit rules. +% : RCS/% + +# Disable VCS-based implicit rules. +% : RCS/%,v + +# Disable VCS-based implicit rules. +% : SCCS/s.% + +# Disable VCS-based implicit rules. +% : s.% + +.SUFFIXES: .hpux_make_needs_suffix_list + +# Command-line flag to silence nested $(MAKE). +$(VERBOSE)MAKESILENT = -s + +#Suppress display of executed commands. +$(VERBOSE).SILENT: + +# A target that is always out of date. +cmake_force: +.PHONY : cmake_force + +#============================================================================= +# Set environment variables for the build. + +# The shell in which to execute make rules. +SHELL = /bin/sh + +# The CMake executable. +CMAKE_COMMAND = /usr/local/bin/cmake + +# The command to remove a file. +RM = /usr/local/bin/cmake -E rm -f + +# Escaping for special characters. +EQUALS = = + +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /home/meleneth/code/QuantumApprentice/msk2bmpGUI + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/meleneth/code/QuantumApprentice/msk2bmpGUI + +#============================================================================= +# Targets provided globally by CMake. + +# Special rule for the target edit_cache +edit_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..." + /usr/local/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) +.PHONY : edit_cache + +# Special rule for the target edit_cache +edit_cache/fast: edit_cache +.PHONY : edit_cache/fast + +# Special rule for the target rebuild_cache +rebuild_cache: + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..." + /usr/local/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) +.PHONY : rebuild_cache + +# Special rule for the target rebuild_cache +rebuild_cache/fast: rebuild_cache +.PHONY : rebuild_cache/fast + +# Special rule for the target list_install_components +list_install_components: + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Available install components are: \"Unspecified\"" +.PHONY : list_install_components + +# Special rule for the target list_install_components +list_install_components/fast: list_install_components +.PHONY : list_install_components/fast + +# Special rule for the target install +install: preinstall + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..." + /usr/local/bin/cmake -P cmake_install.cmake +.PHONY : install + +# Special rule for the target install +install/fast: preinstall/fast + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..." + /usr/local/bin/cmake -P cmake_install.cmake +.PHONY : install/fast + +# Special rule for the target install/local +install/local: preinstall + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..." + /usr/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake +.PHONY : install/local + +# Special rule for the target install/local +install/local/fast: preinstall/fast + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..." + /usr/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake +.PHONY : install/local/fast + +# Special rule for the target install/strip +install/strip: preinstall + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..." + /usr/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake +.PHONY : install/strip + +# Special rule for the target install/strip +install/strip/fast: preinstall/fast + @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..." + /usr/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake +.PHONY : install/strip/fast + +# The main all target +all: cmake_check_build_system + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(CMAKE_COMMAND) -E cmake_progress_start /home/meleneth/code/QuantumApprentice/msk2bmpGUI/CMakeFiles /home/meleneth/code/QuantumApprentice/msk2bmpGUI/src/msk2bmp//CMakeFiles/progress.marks + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 src/msk2bmp/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/meleneth/code/QuantumApprentice/msk2bmpGUI/CMakeFiles 0 +.PHONY : all + +# The main clean target +clean: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 src/msk2bmp/clean +.PHONY : clean + +# The main clean target +clean/fast: clean +.PHONY : clean/fast + +# Prepare targets for installation. +preinstall: all + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 src/msk2bmp/preinstall +.PHONY : preinstall + +# Prepare targets for installation. +preinstall/fast: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 src/msk2bmp/preinstall +.PHONY : preinstall/fast + +# clear depends +depend: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 +.PHONY : depend + +# Convenience name for target. +src/msk2bmp/CMakeFiles/msk2bmp.dir/rule: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 src/msk2bmp/CMakeFiles/msk2bmp.dir/rule +.PHONY : src/msk2bmp/CMakeFiles/msk2bmp.dir/rule + +# Convenience name for target. +msk2bmp: src/msk2bmp/CMakeFiles/msk2bmp.dir/rule +.PHONY : msk2bmp + +# fast build rule for target. +msk2bmp/fast: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/build +.PHONY : msk2bmp/fast + +B_Endian.o: B_Endian.cpp.o +.PHONY : B_Endian.o + +# target to build an object file +B_Endian.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/B_Endian.cpp.o +.PHONY : B_Endian.cpp.o + +B_Endian.i: B_Endian.cpp.i +.PHONY : B_Endian.i + +# target to preprocess a source file +B_Endian.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/B_Endian.cpp.i +.PHONY : B_Endian.cpp.i + +B_Endian.s: B_Endian.cpp.s +.PHONY : B_Endian.s + +# target to generate assembly for a file +B_Endian.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/B_Endian.cpp.s +.PHONY : B_Endian.cpp.s + +Edit_Animation.o: Edit_Animation.cpp.o +.PHONY : Edit_Animation.o + +# target to build an object file +Edit_Animation.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_Animation.cpp.o +.PHONY : Edit_Animation.cpp.o + +Edit_Animation.i: Edit_Animation.cpp.i +.PHONY : Edit_Animation.i + +# target to preprocess a source file +Edit_Animation.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_Animation.cpp.i +.PHONY : Edit_Animation.cpp.i + +Edit_Animation.s: Edit_Animation.cpp.s +.PHONY : Edit_Animation.s + +# target to generate assembly for a file +Edit_Animation.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_Animation.cpp.s +.PHONY : Edit_Animation.cpp.s + +Edit_Image.o: Edit_Image.cpp.o +.PHONY : Edit_Image.o + +# target to build an object file +Edit_Image.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_Image.cpp.o +.PHONY : Edit_Image.cpp.o + +Edit_Image.i: Edit_Image.cpp.i +.PHONY : Edit_Image.i + +# target to preprocess a source file +Edit_Image.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_Image.cpp.i +.PHONY : Edit_Image.cpp.i + +Edit_Image.s: Edit_Image.cpp.s +.PHONY : Edit_Image.s + +# target to generate assembly for a file +Edit_Image.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_Image.cpp.s +.PHONY : Edit_Image.cpp.s + +Edit_TILES_LST.o: Edit_TILES_LST.cpp.o +.PHONY : Edit_TILES_LST.o + +# target to build an object file +Edit_TILES_LST.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_TILES_LST.cpp.o +.PHONY : Edit_TILES_LST.cpp.o + +Edit_TILES_LST.i: Edit_TILES_LST.cpp.i +.PHONY : Edit_TILES_LST.i + +# target to preprocess a source file +Edit_TILES_LST.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_TILES_LST.cpp.i +.PHONY : Edit_TILES_LST.cpp.i + +Edit_TILES_LST.s: Edit_TILES_LST.cpp.s +.PHONY : Edit_TILES_LST.s + +# target to generate assembly for a file +Edit_TILES_LST.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Edit_TILES_LST.cpp.s +.PHONY : Edit_TILES_LST.cpp.s + +FRM_Animate.o: FRM_Animate.cpp.o +.PHONY : FRM_Animate.o + +# target to build an object file +FRM_Animate.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/FRM_Animate.cpp.o +.PHONY : FRM_Animate.cpp.o + +FRM_Animate.i: FRM_Animate.cpp.i +.PHONY : FRM_Animate.i + +# target to preprocess a source file +FRM_Animate.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/FRM_Animate.cpp.i +.PHONY : FRM_Animate.cpp.i + +FRM_Animate.s: FRM_Animate.cpp.s +.PHONY : FRM_Animate.s + +# target to generate assembly for a file +FRM_Animate.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/FRM_Animate.cpp.s +.PHONY : FRM_Animate.cpp.s + +FRM_Convert.o: FRM_Convert.cpp.o +.PHONY : FRM_Convert.o + +# target to build an object file +FRM_Convert.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/FRM_Convert.cpp.o +.PHONY : FRM_Convert.cpp.o + +FRM_Convert.i: FRM_Convert.cpp.i +.PHONY : FRM_Convert.i + +# target to preprocess a source file +FRM_Convert.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/FRM_Convert.cpp.i +.PHONY : FRM_Convert.cpp.i + +FRM_Convert.s: FRM_Convert.cpp.s +.PHONY : FRM_Convert.s + +# target to generate assembly for a file +FRM_Convert.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/FRM_Convert.cpp.s +.PHONY : FRM_Convert.cpp.s + +Image2Texture.o: Image2Texture.cpp.o +.PHONY : Image2Texture.o + +# target to build an object file +Image2Texture.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Image2Texture.cpp.o +.PHONY : Image2Texture.cpp.o + +Image2Texture.i: Image2Texture.cpp.i +.PHONY : Image2Texture.i + +# target to preprocess a source file +Image2Texture.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Image2Texture.cpp.i +.PHONY : Image2Texture.cpp.i + +Image2Texture.s: Image2Texture.cpp.s +.PHONY : Image2Texture.s + +# target to generate assembly for a file +Image2Texture.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Image2Texture.cpp.s +.PHONY : Image2Texture.cpp.s + +Image_Render.o: Image_Render.cpp.o +.PHONY : Image_Render.o + +# target to build an object file +Image_Render.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Image_Render.cpp.o +.PHONY : Image_Render.cpp.o + +Image_Render.i: Image_Render.cpp.i +.PHONY : Image_Render.i + +# target to preprocess a source file +Image_Render.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Image_Render.cpp.i +.PHONY : Image_Render.cpp.i + +Image_Render.s: Image_Render.cpp.s +.PHONY : Image_Render.s + +# target to generate assembly for a file +Image_Render.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Image_Render.cpp.s +.PHONY : Image_Render.cpp.s + +Load_Animation.o: Load_Animation.cpp.o +.PHONY : Load_Animation.o + +# target to build an object file +Load_Animation.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Animation.cpp.o +.PHONY : Load_Animation.cpp.o + +Load_Animation.i: Load_Animation.cpp.i +.PHONY : Load_Animation.i + +# target to preprocess a source file +Load_Animation.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Animation.cpp.i +.PHONY : Load_Animation.cpp.i + +Load_Animation.s: Load_Animation.cpp.s +.PHONY : Load_Animation.s + +# target to generate assembly for a file +Load_Animation.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Animation.cpp.s +.PHONY : Load_Animation.cpp.s + +Load_Files.o: Load_Files.cpp.o +.PHONY : Load_Files.o + +# target to build an object file +Load_Files.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Files.cpp.o +.PHONY : Load_Files.cpp.o + +Load_Files.i: Load_Files.cpp.i +.PHONY : Load_Files.i + +# target to preprocess a source file +Load_Files.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Files.cpp.i +.PHONY : Load_Files.cpp.i + +Load_Files.s: Load_Files.cpp.s +.PHONY : Load_Files.s + +# target to generate assembly for a file +Load_Files.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Files.cpp.s +.PHONY : Load_Files.cpp.s + +Load_Settings.o: Load_Settings.cpp.o +.PHONY : Load_Settings.o + +# target to build an object file +Load_Settings.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Settings.cpp.o +.PHONY : Load_Settings.cpp.o + +Load_Settings.i: Load_Settings.cpp.i +.PHONY : Load_Settings.i + +# target to preprocess a source file +Load_Settings.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Settings.cpp.i +.PHONY : Load_Settings.cpp.i + +Load_Settings.s: Load_Settings.cpp.s +.PHONY : Load_Settings.s + +# target to generate assembly for a file +Load_Settings.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Load_Settings.cpp.s +.PHONY : Load_Settings.cpp.s + +MSK_Convert.o: MSK_Convert.cpp.o +.PHONY : MSK_Convert.o + +# target to build an object file +MSK_Convert.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/MSK_Convert.cpp.o +.PHONY : MSK_Convert.cpp.o + +MSK_Convert.i: MSK_Convert.cpp.i +.PHONY : MSK_Convert.i + +# target to preprocess a source file +MSK_Convert.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/MSK_Convert.cpp.i +.PHONY : MSK_Convert.cpp.i + +MSK_Convert.s: MSK_Convert.cpp.s +.PHONY : MSK_Convert.s + +# target to generate assembly for a file +MSK_Convert.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/MSK_Convert.cpp.s +.PHONY : MSK_Convert.cpp.s + +Palette_Cycle.o: Palette_Cycle.cpp.o +.PHONY : Palette_Cycle.o + +# target to build an object file +Palette_Cycle.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Palette_Cycle.cpp.o +.PHONY : Palette_Cycle.cpp.o + +Palette_Cycle.i: Palette_Cycle.cpp.i +.PHONY : Palette_Cycle.i + +# target to preprocess a source file +Palette_Cycle.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Palette_Cycle.cpp.i +.PHONY : Palette_Cycle.cpp.i + +Palette_Cycle.s: Palette_Cycle.cpp.s +.PHONY : Palette_Cycle.s + +# target to generate assembly for a file +Palette_Cycle.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Palette_Cycle.cpp.s +.PHONY : Palette_Cycle.cpp.s + +Preview_Image.o: Preview_Image.cpp.o +.PHONY : Preview_Image.o + +# target to build an object file +Preview_Image.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Preview_Image.cpp.o +.PHONY : Preview_Image.cpp.o + +Preview_Image.i: Preview_Image.cpp.i +.PHONY : Preview_Image.i + +# target to preprocess a source file +Preview_Image.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Preview_Image.cpp.i +.PHONY : Preview_Image.cpp.i + +Preview_Image.s: Preview_Image.cpp.s +.PHONY : Preview_Image.s + +# target to generate assembly for a file +Preview_Image.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Preview_Image.cpp.s +.PHONY : Preview_Image.cpp.s + +Preview_Tiles.o: Preview_Tiles.cpp.o +.PHONY : Preview_Tiles.o + +# target to build an object file +Preview_Tiles.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Preview_Tiles.cpp.o +.PHONY : Preview_Tiles.cpp.o + +Preview_Tiles.i: Preview_Tiles.cpp.i +.PHONY : Preview_Tiles.i + +# target to preprocess a source file +Preview_Tiles.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Preview_Tiles.cpp.i +.PHONY : Preview_Tiles.cpp.i + +Preview_Tiles.s: Preview_Tiles.cpp.s +.PHONY : Preview_Tiles.s + +# target to generate assembly for a file +Preview_Tiles.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Preview_Tiles.cpp.s +.PHONY : Preview_Tiles.cpp.s + +Save_Files.o: Save_Files.cpp.o +.PHONY : Save_Files.o + +# target to build an object file +Save_Files.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Save_Files.cpp.o +.PHONY : Save_Files.cpp.o + +Save_Files.i: Save_Files.cpp.i +.PHONY : Save_Files.i + +# target to preprocess a source file +Save_Files.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Save_Files.cpp.i +.PHONY : Save_Files.cpp.i + +Save_Files.s: Save_Files.cpp.s +.PHONY : Save_Files.s + +# target to generate assembly for a file +Save_Files.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Save_Files.cpp.s +.PHONY : Save_Files.cpp.s + +Zoom_Pan.o: Zoom_Pan.cpp.o +.PHONY : Zoom_Pan.o + +# target to build an object file +Zoom_Pan.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Zoom_Pan.cpp.o +.PHONY : Zoom_Pan.cpp.o + +Zoom_Pan.i: Zoom_Pan.cpp.i +.PHONY : Zoom_Pan.i + +# target to preprocess a source file +Zoom_Pan.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Zoom_Pan.cpp.i +.PHONY : Zoom_Pan.cpp.i + +Zoom_Pan.s: Zoom_Pan.cpp.s +.PHONY : Zoom_Pan.s + +# target to generate assembly for a file +Zoom_Pan.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/Zoom_Pan.cpp.s +.PHONY : Zoom_Pan.cpp.s + +display_FRM_OpenGL.o: display_FRM_OpenGL.cpp.o +.PHONY : display_FRM_OpenGL.o + +# target to build an object file +display_FRM_OpenGL.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/display_FRM_OpenGL.cpp.o +.PHONY : display_FRM_OpenGL.cpp.o + +display_FRM_OpenGL.i: display_FRM_OpenGL.cpp.i +.PHONY : display_FRM_OpenGL.i + +# target to preprocess a source file +display_FRM_OpenGL.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/display_FRM_OpenGL.cpp.i +.PHONY : display_FRM_OpenGL.cpp.i + +display_FRM_OpenGL.s: display_FRM_OpenGL.cpp.s +.PHONY : display_FRM_OpenGL.s + +# target to generate assembly for a file +display_FRM_OpenGL.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/display_FRM_OpenGL.cpp.s +.PHONY : display_FRM_OpenGL.cpp.s + +load_FRM_OpenGL.o: load_FRM_OpenGL.cpp.o +.PHONY : load_FRM_OpenGL.o + +# target to build an object file +load_FRM_OpenGL.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/load_FRM_OpenGL.cpp.o +.PHONY : load_FRM_OpenGL.cpp.o + +load_FRM_OpenGL.i: load_FRM_OpenGL.cpp.i +.PHONY : load_FRM_OpenGL.i + +# target to preprocess a source file +load_FRM_OpenGL.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/load_FRM_OpenGL.cpp.i +.PHONY : load_FRM_OpenGL.cpp.i + +load_FRM_OpenGL.s: load_FRM_OpenGL.cpp.s +.PHONY : load_FRM_OpenGL.s + +# target to generate assembly for a file +load_FRM_OpenGL.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/load_FRM_OpenGL.cpp.s +.PHONY : load_FRM_OpenGL.cpp.s + +platform_io.o: platform_io.cpp.o +.PHONY : platform_io.o + +# target to build an object file +platform_io.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/platform_io.cpp.o +.PHONY : platform_io.cpp.o + +platform_io.i: platform_io.cpp.i +.PHONY : platform_io.i + +# target to preprocess a source file +platform_io.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/platform_io.cpp.i +.PHONY : platform_io.cpp.i + +platform_io.s: platform_io.cpp.s +.PHONY : platform_io.s + +# target to generate assembly for a file +platform_io.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/platform_io.cpp.s +.PHONY : platform_io.cpp.s + +shader_class.o: shader_class.cpp.o +.PHONY : shader_class.o + +# target to build an object file +shader_class.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/shader_class.cpp.o +.PHONY : shader_class.cpp.o + +shader_class.i: shader_class.cpp.i +.PHONY : shader_class.i + +# target to preprocess a source file +shader_class.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/shader_class.cpp.i +.PHONY : shader_class.cpp.i + +shader_class.s: shader_class.cpp.s +.PHONY : shader_class.s + +# target to generate assembly for a file +shader_class.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/shader_class.cpp.s +.PHONY : shader_class.cpp.s + +timer_functions.o: timer_functions.cpp.o +.PHONY : timer_functions.o + +# target to build an object file +timer_functions.cpp.o: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/timer_functions.cpp.o +.PHONY : timer_functions.cpp.o + +timer_functions.i: timer_functions.cpp.i +.PHONY : timer_functions.i + +# target to preprocess a source file +timer_functions.cpp.i: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/timer_functions.cpp.i +.PHONY : timer_functions.cpp.i + +timer_functions.s: timer_functions.cpp.s +.PHONY : timer_functions.s + +# target to generate assembly for a file +timer_functions.cpp.s: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(MAKE) $(MAKESILENT) -f src/msk2bmp/CMakeFiles/msk2bmp.dir/build.make src/msk2bmp/CMakeFiles/msk2bmp.dir/timer_functions.cpp.s +.PHONY : timer_functions.cpp.s + +# Help Target +help: + @echo "The following are some of the valid targets for this Makefile:" + @echo "... all (the default if no target is provided)" + @echo "... clean" + @echo "... depend" + @echo "... edit_cache" + @echo "... install" + @echo "... install/local" + @echo "... install/strip" + @echo "... list_install_components" + @echo "... rebuild_cache" + @echo "... msk2bmp" + @echo "... B_Endian.o" + @echo "... B_Endian.i" + @echo "... B_Endian.s" + @echo "... Edit_Animation.o" + @echo "... Edit_Animation.i" + @echo "... Edit_Animation.s" + @echo "... Edit_Image.o" + @echo "... Edit_Image.i" + @echo "... Edit_Image.s" + @echo "... Edit_TILES_LST.o" + @echo "... Edit_TILES_LST.i" + @echo "... Edit_TILES_LST.s" + @echo "... FRM_Animate.o" + @echo "... FRM_Animate.i" + @echo "... FRM_Animate.s" + @echo "... FRM_Convert.o" + @echo "... FRM_Convert.i" + @echo "... FRM_Convert.s" + @echo "... Image2Texture.o" + @echo "... Image2Texture.i" + @echo "... Image2Texture.s" + @echo "... Image_Render.o" + @echo "... Image_Render.i" + @echo "... Image_Render.s" + @echo "... Load_Animation.o" + @echo "... Load_Animation.i" + @echo "... Load_Animation.s" + @echo "... Load_Files.o" + @echo "... Load_Files.i" + @echo "... Load_Files.s" + @echo "... Load_Settings.o" + @echo "... Load_Settings.i" + @echo "... Load_Settings.s" + @echo "... MSK_Convert.o" + @echo "... MSK_Convert.i" + @echo "... MSK_Convert.s" + @echo "... Palette_Cycle.o" + @echo "... Palette_Cycle.i" + @echo "... Palette_Cycle.s" + @echo "... Preview_Image.o" + @echo "... Preview_Image.i" + @echo "... Preview_Image.s" + @echo "... Preview_Tiles.o" + @echo "... Preview_Tiles.i" + @echo "... Preview_Tiles.s" + @echo "... Save_Files.o" + @echo "... Save_Files.i" + @echo "... Save_Files.s" + @echo "... Zoom_Pan.o" + @echo "... Zoom_Pan.i" + @echo "... Zoom_Pan.s" + @echo "... display_FRM_OpenGL.o" + @echo "... display_FRM_OpenGL.i" + @echo "... display_FRM_OpenGL.s" + @echo "... load_FRM_OpenGL.o" + @echo "... load_FRM_OpenGL.i" + @echo "... load_FRM_OpenGL.s" + @echo "... platform_io.o" + @echo "... platform_io.i" + @echo "... platform_io.s" + @echo "... shader_class.o" + @echo "... shader_class.i" + @echo "... shader_class.s" + @echo "... timer_functions.o" + @echo "... timer_functions.i" + @echo "... timer_functions.s" +.PHONY : help + + + +#============================================================================= +# Special targets to cleanup operation of make. + +# Special rule to run CMake to check the build system integrity. +# No rule that depends on this can have commands that come from listfiles +# because they might be regenerated. +cmake_check_build_system: + cd /home/meleneth/code/QuantumApprentice/msk2bmpGUI && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 +.PHONY : cmake_check_build_system + diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Palette_Cycle.cpp b/src/msk2bmp/Palette_Cycle.cpp similarity index 96% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Palette_Cycle.cpp rename to src/msk2bmp/Palette_Cycle.cpp index 46a9ae6..43d6a87 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Palette_Cycle.cpp +++ b/src/msk2bmp/Palette_Cycle.cpp @@ -1,7 +1,7 @@ //https://falloutmods.fandom.com/wiki/PAL_File_Format //https://falloutmods.fandom.com/wiki/Pal_animations#Animated_colors +#include #include "Palette_Cycle.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" #ifdef QFO2_WINDOWS #include #elif defined(QFO2_LINUX) @@ -183,4 +183,4 @@ bool load_palette_to_float_array(float* palette, char* exe_path) printf("Palette file opened, but couldn't read?"); return false; } -} \ No newline at end of file +} diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Palette_Cycle.h b/src/msk2bmp/Palette_Cycle.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Palette_Cycle.h rename to src/msk2bmp/Palette_Cycle.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Image.cpp b/src/msk2bmp/Preview_Image.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Image.cpp rename to src/msk2bmp/Preview_Image.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Image.h b/src/msk2bmp/Preview_Image.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Image.h rename to src/msk2bmp/Preview_Image.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Tiles.cpp b/src/msk2bmp/Preview_Tiles.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Tiles.cpp rename to src/msk2bmp/Preview_Tiles.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Tiles.h b/src/msk2bmp/Preview_Tiles.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Preview_Tiles.h rename to src/msk2bmp/Preview_Tiles.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Save_Files.cpp b/src/msk2bmp/Save_Files.cpp similarity index 97% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Save_Files.cpp rename to src/msk2bmp/Save_Files.cpp index 61f0f30..a2e75f3 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Save_Files.cpp +++ b/src/msk2bmp/Save_Files.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #ifdef QFO2_WINDOWS #include @@ -16,7 +17,6 @@ #include "Save_Files.h" #include "B_Endian.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" #include "imgui.h" #include "Load_Settings.h" #include "MSK_Convert.h" diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Save_Files.h b/src/msk2bmp/Save_Files.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Save_Files.h rename to src/msk2bmp/Save_Files.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Zoom_Pan.cpp b/src/msk2bmp/Zoom_Pan.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Zoom_Pan.cpp rename to src/msk2bmp/Zoom_Pan.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Zoom_Pan.h b/src/msk2bmp/Zoom_Pan.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/Zoom_Pan.h rename to src/msk2bmp/Zoom_Pan.h diff --git a/src/msk2bmp/cmake_install.cmake b/src/msk2bmp/cmake_install.cmake new file mode 100644 index 0000000..ca967f3 --- /dev/null +++ b/src/msk2bmp/cmake_install.cmake @@ -0,0 +1,44 @@ +# Install script for directory: /home/meleneth/code/QuantumApprentice/msk2bmpGUI/src/msk2bmp + +# Set the install prefix +if(NOT DEFINED CMAKE_INSTALL_PREFIX) + set(CMAKE_INSTALL_PREFIX "/usr/local") +endif() +string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + +# Set the install configuration name. +if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) + if(BUILD_TYPE) + string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" + CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") + else() + set(CMAKE_INSTALL_CONFIG_NAME "") + endif() + message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") +endif() + +# Set the component getting installed. +if(NOT CMAKE_INSTALL_COMPONENT) + if(COMPONENT) + message(STATUS "Install component: \"${COMPONENT}\"") + set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") + else() + set(CMAKE_INSTALL_COMPONENT) + endif() +endif() + +# Install shared libraries without execute permission? +if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) + set(CMAKE_INSTALL_SO_NO_EXE "1") +endif() + +# Is this installation the result of a crosscompile? +if(NOT DEFINED CMAKE_CROSSCOMPILING) + set(CMAKE_CROSSCOMPILING "FALSE") +endif() + +# Set default install directory permissions. +if(NOT DEFINED CMAKE_OBJDUMP) + set(CMAKE_OBJDUMP "/usr/bin/objdump") +endif() + diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/display_FRM_OpenGL.cpp b/src/msk2bmp/display_FRM_OpenGL.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/display_FRM_OpenGL.cpp rename to src/msk2bmp/display_FRM_OpenGL.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/display_FRM_OpenGL.h b/src/msk2bmp/display_FRM_OpenGL.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/display_FRM_OpenGL.h rename to src/msk2bmp/display_FRM_OpenGL.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/load_FRM_OpenGL.cpp b/src/msk2bmp/load_FRM_OpenGL.cpp similarity index 96% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/load_FRM_OpenGL.cpp rename to src/msk2bmp/load_FRM_OpenGL.cpp index ce325f8..e309043 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/load_FRM_OpenGL.cpp +++ b/src/msk2bmp/load_FRM_OpenGL.cpp @@ -1,6 +1,7 @@ +#include + #include "load_FRM_OpenGL.h" #include "B_Endian.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" //returns true/false for success/failure bool init_framebuffer(struct image_data* img_data) @@ -302,4 +303,4 @@ bool load_FRM_OpenGL(const char* file_name, image_data* img_data) printf("Couldn't load FRM image data...\n"); return false; } -} \ No newline at end of file +} diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/load_FRM_OpenGL.h b/src/msk2bmp/load_FRM_OpenGL.h similarity index 95% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/load_FRM_OpenGL.h rename to src/msk2bmp/load_FRM_OpenGL.h index 51ef4bb..8d359d3 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/load_FRM_OpenGL.h +++ b/src/msk2bmp/load_FRM_OpenGL.h @@ -2,7 +2,7 @@ #include #include -#include "imgui.h" +#include #include "Load_Animation.h" #include "Load_Settings.h" diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/platform_io.cpp b/src/msk2bmp/platform_io.cpp similarity index 98% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/platform_io.cpp rename to src/msk2bmp/platform_io.cpp index 157151d..309a48f 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/platform_io.cpp +++ b/src/msk2bmp/platform_io.cpp @@ -1,6 +1,6 @@ +#include #include "platform_io.h" #include "Image2Texture.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" #ifdef QFO2_WINDOWS #include diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/platform_io.h b/src/msk2bmp/platform_io.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/platform_io.h rename to src/msk2bmp/platform_io.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/shader_class.cpp b/src/msk2bmp/shader_class.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/shader_class.cpp rename to src/msk2bmp/shader_class.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/shader_class.h b/src/msk2bmp/shader_class.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/shader_class.h rename to src/msk2bmp/shader_class.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/timer_functions.cpp b/src/msk2bmp/timer_functions.cpp similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/timer_functions.cpp rename to src/msk2bmp/timer_functions.cpp diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/timer_functions.h b/src/msk2bmp/timer_functions.h similarity index 100% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/timer_functions.h rename to src/msk2bmp/timer_functions.h diff --git a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI.cpp b/src/msk2bmpGUI.cpp similarity index 97% rename from msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI.cpp rename to src/msk2bmpGUI.cpp index 6fb38e2..35b64a6 100644 --- a/msk2bmpGUI_C_C++_imgui_sdl2_tinyfiledialogs/msk2bmpGUI.cpp +++ b/src/msk2bmpGUI.cpp @@ -34,6 +34,8 @@ #include #include +#include + // My header files #include "platform_io.h" #include "Load_Files.h" @@ -44,7 +46,6 @@ #include "FRM_Animate.h" #include "Edit_Image.h" #include "Preview_Image.h" -#include "dependencies/tinyfiledialogs/tinyfiledialogs.h" #include "display_FRM_OpenGL.h" #include "Palette_Cycle.h" @@ -1150,4 +1151,4 @@ void popup_save_menu(bool* open_window, int* save_type, bool* single_dir) *open_window = false; } ImGui::End(); -} \ No newline at end of file +}