From 2d778a4990cc09e14fe4472d8f7e77034a67a11c Mon Sep 17 00:00:00 2001
From: dirkarnez <smalldirkalex@gmail.com>
Date: Tue, 4 Jan 2022 22:57:48 +0800
Subject: [PATCH] - revamp project

---
 CMakeLists.txt           | 16 +++++++++-------
 README.md                |  2 ++
 local-build.cmd          | 13 +++++++++++++
 main.cpp => src/main.cpp |  0
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 local-build.cmd
 rename main.cpp => src/main.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49236f9..5048a8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 
-# uncomment these 2 lines if using clang
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -target x86_64-w64-mingw32")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -target x86_64-w64-mingw32")
-
 project(ColorPicker)
+
 set(BUILD_SHARED_LIBS FALSE)
 set(SFML_BUILD_AUDIO FALSE)
 set(SFML_BUILD_DOC FALSE)
@@ -17,8 +14,11 @@ set(SFML_INSTALL_PKGCONFIG_FILES FALSE)
 set(SFML_OPENGL_ES FALSE)
 set(SFML_USE_STATIC_STD_LIBS FALSE)
 set(SFML_USE_SYSTEM_DEPS TRUE)
+set(SFML_STATIC_LIBRARIES TRUE)
 
-add_subdirectory("SFML")
+find_package(SFML 2.5.1 COMPONENTS system window graphics REQUIRED PATHS 
+    "P:\\Downloads\\cpp-libraries\\SFML\\build\\sfml\\lib\\cmake\\SFML"
+)
 
 # uncomment this line if using msvc
 # SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /subsystem:windows /ENTRY:mainCRTStartup")
@@ -26,6 +26,8 @@ add_subdirectory("SFML")
 # uncomment this line if using clang
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -Wl,--subsystem,windows")
 
-add_executable(ColorPicker main.cpp)
+add_executable(ColorPicker
+    "src/main.cpp"
+)
 
-target_link_libraries(ColorPicker sfml-graphics)
+target_link_libraries(ColorPicker sfml-graphics)
\ No newline at end of file
diff --git a/README.md b/README.md
index a3bf887..312f883 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 ColorPicker
 ===========
+### Notes
+- DOES NOT use Clang
 
 ### Reference
 - https://github.com/SFML/SFML/blob/master/examples/win32/Win32.cpp
\ No newline at end of file
diff --git a/local-build.cmd b/local-build.cmd
new file mode 100644
index 0000000..0259ef1
--- /dev/null
+++ b/local-build.cmd
@@ -0,0 +1,13 @@
+REM run as Administrator
+@echo off
+cd /d %~dp0
+set DOWNLOAD_DIR=%USERPROFILE%\Downloads
+set DOWNLOAD_DIR_LINUX=%DOWNLOAD_DIR:\=/%
+SET PATH=%DOWNLOAD_DIR%\PortableGit\bin;%DOWNLOAD_DIR%\mingw64;%DOWNLOAD_DIR%\mingw64\bin;%DOWNLOAD_DIR%\cmake-3.22.0-rc1-windows-x86_64\bin;%PATH%
+cmake.exe -G"MinGW Makefiles" -B./build
+cd build
+
+:rebuild_and_startapp
+mingw32-make.exe
+pause
+REM GOTO rebuild_and_startapp
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp