diff --git a/CMakeLists.txt b/CMakeLists.txt index 12818a2..7295bbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,32 +6,21 @@ include(FindPackageHandleStandardArgs) option(STEAM "Build for Steam" OFF) set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder") -option(DEBUG "Debug mode" OFF) +option(DEBUG "Debug mode" ON) ## Misc setup ## set(CMAKE_INCLUDE_CURRENT_DIR ON) #i want die -set(DEBUG_C_FLAGS "-g -O0 -fno-omit-frame-pointer -ggdb") -set(DEBUG_CXX_FLAGS "-g -O0 -fno-omit-frame-pointer -ggdb") +# set(DEBUG_C_FLAGS "-g -O0 -fno-omit-frame-pointer -ggdb") +# set(DEBUG_CXX_FLAGS "-g -O0 -fno-omit-frame-pointer -ggdb") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${DEBUG_C_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEBUG_CXX_FLAGS}") ## Setup main source ## -# oldimpls dir stuff -set(OLDIMPLS_HEADERS - src/oldimpls/include.h - src/oldimpls/sdl/include.h -) - -set(OLDIMPLS_SOURCE - src/oldimpls/sdl/rgb-surfaces.cpp -) - # main stuff set(MAIN_HEADERS - ${OLDIMPLS_HEADERS} src/quadarray.h src/audio.h src/binding.h @@ -347,9 +336,6 @@ target_link_libraries(${PROJECT_NAME} Boost::boost ${Boost_LIBRARIES} ${VORBISFILE_LIBRARIES}) -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math") -#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math") - IF(APPLE) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM) ENDIF() diff --git a/README.md b/README.md index 23069ce..b3b903e 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,3 @@ cmake -S . -B build cd build make -jn n - count of threads for compilation - -# TODOs: -* Port to SDL3,Modern ruby and other -* Extend API with usefull thinks idk... -* Fix bugs -* Upgrade linux support -* MAKE THIS WORK diff --git a/cleanup.sh b/cleanup.sh index 60f62b0..ea861b7 100644 --- a/cleanup.sh +++ b/cleanup.sh @@ -16,13 +16,9 @@ rm -rf *.user rm -rf _______.app rm -rf OneShot.app rm -rf oneshot -rm -rf conanbuildinfo.cmake rm -rf CMakeFiles rm -rf cmake_install.cmake rm -rf CMakeCache.txt -rm -rf conanbuildinfo.txt -rm -rf conaninfo.txt -rm -rf conan_imports_manifest.txt rm -rf *.xxd rm -rf *.dir if [ -f .qmake.stash ] diff --git a/journal/unix/journal.py b/journal/unix/journal.py index 3d70ce8..0b65984 100644 --- a/journal/unix/journal.py +++ b/journal/unix/journal.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- + # -*- coding: utf-8 -*- import os, sys, time diff --git a/src/bitmap.cpp b/src/bitmap.cpp index 39c2e82..709fa6d 100644 --- a/src/bitmap.cpp +++ b/src/bitmap.cpp @@ -44,9 +44,6 @@ #include "font.h" #include "eventthread.h" -// :3c -#include "oldimpls/include.h" - #define GUARD_MEGA \ { \ if (p->megaSurface) \ diff --git a/src/oldimpls/include.h b/src/oldimpls/include.h deleted file mode 100644 index c0208dc..0000000 --- a/src/oldimpls/include.h +++ /dev/null @@ -1 +0,0 @@ -#include "sdl/include.h" \ No newline at end of file diff --git a/src/oldimpls/sdl/include.h b/src/oldimpls/sdl/include.h deleted file mode 100644 index a78eecd..0000000 --- a/src/oldimpls/sdl/include.h +++ /dev/null @@ -1,6 +0,0 @@ -#include - -#ifndef _OLDIMPLS_SDL_INCLUDE_H -#define _OLDIMPLS_SDL_INCLUDE_H -//:3 -#endif diff --git a/src/oldimpls/sdl/rgb-surfaces.cpp b/src/oldimpls/sdl/rgb-surfaces.cpp deleted file mode 100644 index 670858b..0000000 --- a/src/oldimpls/sdl/rgb-surfaces.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "include.h" - -// taken from: https://wiki.libsdl.org/SDL3/README-migration#sdl_surfaceh