fixing boehm_gc

CMakeLists.txt

@@ -13,9 +13,15 @@ if (EXISTS /usr/local/include)
 	include_directories(/usr/local/include)
 endif()
 
-include_directories(AFTER SYSTEM ${CMAKE_BINARY_DIR}/deps/resvg/capi/include/)
+find_library(BoehmGC_C NAMES gc-threaded REQUIRED)
+find_library(BoehmGC_CPP NAMES gccpp-threaded REQUIRED)
+set(BoehmGC ${BoehmGC_C} ${BoehmGC_CPP})
 
-add_subdirectory(deps)
+find_package(X11)
+
+#include_directories(AFTER SYSTEM ${CMAKE_BINARY_DIR}/deps/resvg/capi/include/)
+
+#add_subdirectory(deps)
 
 add_subdirectory(src/libnde)
 #add_subdirectory(src/libntk)

clean.sh

+#!/bin/sh
+
+CMAKEFILES=`find * -type d -name CMakeFiles`
+CMAKECACHE=`find * -type f -name CMakeCache.txt`
+MAKEFILES=`find * -type f -name Makefile`
+INSTALL=`find * -type f -name cmake_install.cmake`
+PKGLIST=`find * -type f -name install_manifest.txt`
+VIMS=`find * -type f -name "*~"`
+BUILDS=`find * -type d -name build`
+
+if [ -n "${CMAKEFILES}" ]; then
+	echo Removing CMakeFiles
+	rm -r ${CMAKEFILES}
+fi
+
+if [ -n "${CMAKECACHE}" ]; then
+	echo Removing CMakeCache
+	rm ${CMAKECACHE}
+fi
+
+if [ -n "${MAKEFILES}" ]; then
+	echo Removing Makefiles
+	rm ${MAKEFILES}
+fi
+
+if [ -n "${INSTALL}" ]; then
+	echo Removing cmake_install.cmake
+	rm ${INSTALL}
+fi
+
+if [ -n "${PKGLIST}" ]; then
+	echo Removing install manifsts
+	rm ${PKGLIST}
+fi
+
+if [ -n "${VIMS}" ]; then
+	echo Removing vim backups
+	rm ${VIMS}
+fi
+
+if [ -n "${BUILDS}" ]; then
+	echo Removing artifacts
+	rm -rf ${BUILDS}
+fi
+
+if [ -d localized ]; then
+	echo Removing localized text
+	rm -rf localized
+fi
+

src/NitroWin/CMakeLists.txt

@@ -2,11 +2,9 @@ cmake_minimum_required (VERSION 3.10)
 project (NitroWin)
 configure_file(${PROJECT_NAME}.h.in ${PROJECT_NAME}.h)
 
-find_package(X11)
-
 link_libraries(${X11_LIBRARIES})
 
 add_executable(${PROJECT_NAME} NUtils.cpp NWMAction.cpp NWManager.cpp main.cpp)
-target_link_libraries(${PROJECT_NAME} LINK_PUBLIC nde )
+target_link_libraries(${PROJECT_NAME} LINK_PUBLIC ${BoehmGC} nde)
 
 install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)

src/NitroWin/NUtils.h

@@ -43,7 +43,7 @@
 #include <X11/Xatom.h>
 #include <iostream>
 
-class NUtils {
+class NUtils : public gc {
 public:
 	static void frameWindow(Window w);
 	static void frameWindow(Window w, bool pre_exist);

src/NitroWin/NWMAction.h

@@ -45,7 +45,7 @@
 //template <class T> class NSize;
 //template <typename T> class NPosition;
 
-class NWMAction {
+class NWMAction : public gc {
 protected:
 	// MOVING WINDOWS
 	static nitrogen::NPosition<int> *drag_start_cursor;

src/NitroWin/NWManager.h

@@ -30,7 +30,7 @@
 #include "NitroWin.h"
 #include <unordered_map>
 
-class NWManager {
+class NWManager : public gc {
 public:
 	NWManager();
 	virtual ~NWManager();

src/NitroWin/NitroWin.h

@@ -44,5 +44,13 @@
 #include <X11/Xlib.h>
 #include <X11/X.h>
 
+#ifndef GC_NAME_CONFLICT
+#define GC_NAME_CONFLICT
+#include <gc/gc.h>
+#include <gc/gc_cpp.h>
+#include <gc/gc_allocator.h>
+#include <gc/gc_backptr.h>
+#endif
+
 #endif /* NITROWIN_H */
 

src/NitroWin/NitroWin.h.in

@@ -44,5 +44,13 @@
 #include <X11/Xlib.h>
 #include <X11/X.h>
 
+#ifndef GC_NAME_CONFLICT
+#define GC_NAME_CONFLICT
+#include <gc/gc.h>
+#include <gc/gc_cpp.h>
+#include <gc/gc_allocator.h>
+#include <gc/gc_backptr.h>
+#endif
+
 #endif /* NITROWIN_H */
 

src/NitroWin/main.cpp

@@ -5,6 +5,7 @@
 #include <iostream>
 
 int main(int argc, char** argv) {
+	GC_INIT();
 	std::cout << NITROWIN_NAME << " v" << NITROWIN_VERSION << std::endl;
 	NWManager *nwm = new NWManager();
 	nwm->run();

src/libnde/CMakeLists.txt

@@ -2,10 +2,6 @@ cmake_minimum_required (VERSION 3.10)
 project (nde)
 configure_file(${PROJECT_NAME}.h.in ${PROJECT_NAME}.h)
 
-#include_directories("/usr/local/include")
-
-find_library(BoehmGC gc-threaded REQUIRED)
-
 add_library(${PROJECT_NAME} SHARED ndeMain.cpp
 nitrogen/NPosition.cpp
 nitrogen/NSize.cpp)

src/libntk/CMakeLists.txt

@@ -45,3 +45,4 @@ target_include_directories (ntk PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 install(FILES ${PROJECT_NAME}.h DESTINATION include)
 install(DIRECTORY nitrogen DESTINATION include FILES_MATCHING PATTERN "*.h")
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib)
+