GUI+PROJECT: "build" -> "gui_build"

Avinm · Nov 8, 2015 · 223c3cc · 223c3cc
1 parent a39406e
commit 223c3cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/clean.bat b/clean.bat
@@ -9,9 +9,6 @@ rmdir /S /Q release
 rmdir /S /Q build
 rmdir /S /Q cov-int
 
-echo Cleaning SRC...
-rmdir /S /Q src\build
-
 echo Cleaning BRIDGE...
 cd src\bridge
 call :delfiles
@@ -28,6 +25,9 @@ echo Cleaning LAUNCHER...
 cd src\launcher
 call :delfiles
 
+echo Cleaning GUI SRC...
+rmdir /S /Q src\gui_build
+
 echo Cleaning GUI...
 cd src/gui
 rmdir /S /Q build

diff --git a/src/gui/x64dbg.pro b/src/gui/x64dbg.pro
@@ -11,13 +11,13 @@ X64_SRC_DIR = $$PWD/../                 # Main /src/<PROJECT> directory relative
                                         # Contains dbg, exe, gui, bridge, and launcher.
 
 !contains(QMAKE_HOST.arch, x86_64) {
-    X64_BIN_DIR = $$PWD/../../bin/x32   # Relative BIN path, 32-bit
-    X64_GEN_DIR = $$PWD/../build/out32  # QMake temporary generated files, placed inside the build folder. (OBJ, UI, MOC)
-    TARGET = x32gui                     # Build x32gui
+    X64_BIN_DIR = $$PWD/../../bin/x32      # Relative BIN path, 32-bit
+    X64_GEN_DIR = $$PWD/../gui_build/out32 # QMake temporary generated files, placed inside the build folder. (OBJ, UI, MOC)
+    TARGET = x32gui                        # Build x32gui
 } else {
-    X64_BIN_DIR = $$PWD/../../bin/x64   # Relative BIN path, 64-bit
-    X64_GEN_DIR = $$PWD/../build/out64  # QMake temporary generated files, placed inside the build folder. (OBJ, UI, MOC)
-    TARGET = x64gui                     # Build x64gui
+    X64_BIN_DIR = $$PWD/../../bin/x64      # Relative BIN path, 64-bit
+    X64_GEN_DIR = $$PWD/../gui_build/out64 # QMake temporary generated files, placed inside the build folder. (OBJ, UI, MOC)
+    TARGET = x64gui                        # Build x64gui
 }
 
 ##