Merge branch 'v2' of https://github.com/aldrik-ramaekers/text-search …

…into v2
aldrik-ramaekers · Mar 10, 2024 · 8624092 · 8624092
2 parents e039ec4 + d3d0ddf
commit 8624092
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build_linux.sh b/build_linux.sh
@@ -9,7 +9,7 @@ if [[ $* == *-release* ]]; then
 fi
 
 mkdir -p $OUT_DIR
-g++ -m64 -std=c++17 $FLAGS -DUNICODE -o $OUT_DIR/text-search imgui/imgui*.cpp imgui/backends/imgui_impl_glfw.cpp src/widgets/*.cpp src/*.cpp imfiledialog/*.cpp src/linux/*.cpp -Iimgui -Iimgui/backends -Isrc -Isrc/linux -pthread -ldl -lglfw -lGLU -lGL
+g++ -m64 -std=c++17 $FLAGS -DUNICODE -o $OUT_DIR/text-search imgui/imgui*.cpp imgui/backends/imgui_impl_glfw.cpp src/widgets/*.cpp src/*.cpp imfiledialog/*.cpp src/unix/*.cpp -Iimgui -Iimgui/backends -Isrc -Isrc/unix -pthread -ldl -lglfw -lGLU -lGL
 
 if [[ $* == *-r* ]]; then
 	./$OUT_DIR/text-search

diff --git a/src/unix/main_unix.cpp b/src/unix/main_unix.cpp
@@ -29,6 +29,7 @@ bool program_running = true;
 
 char config_path[MAX_INPUT_LENGTH];
 static const char* _ts_platform_get_config_file_path(char* buffer) {
+	// TODO: this can be easily merged.
 #ifdef __APPLE__
 	char* env = getenv("HOME");
 	char path_buf[MAX_INPUT_LENGTH];
@@ -45,7 +46,6 @@ static const char* _ts_platform_get_config_file_path(char* buffer) {
 	char path_buf[MAX_INPUT_LENGTH];
 	snprintf(path_buf, MAX_INPUT_LENGTH, "%s%s", env, "/text-search/");
 	snprintf(buffer, MAX_INPUT_LENGTH, "%.*s%s", MAX_INPUT_LENGTH-10, path_buf, "imgui.ini");
-	printf();
 	if (!ts_platform_dir_exists(path_buf)) {
 		mkdir(path_buf, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 	}