Skip to content

Commit

Permalink
Rebuild the project and delete previous build files.
Browse files Browse the repository at this point in the history
  • Loading branch information
malichao committed Jan 24, 2016
1 parent 89b6b52 commit d0688d2
Show file tree
Hide file tree
Showing 87 changed files with 316 additions and 93,698 deletions.
14 changes: 7 additions & 7 deletions GerberCAM.pro.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.3.0, 2016-01-24T15:27:32. -->
<!-- Written by QtCreator 3.3.0, 2016-01-24T15:36:21. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
Expand Down Expand Up @@ -65,7 +65,7 @@
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Lichao/Documents/gerberCAM/gerberCAM v071/debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/MalcStudio/CAM/gerberCAM/GerberCAM/debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
Expand Down Expand Up @@ -119,7 +119,7 @@
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Lichao/Documents/gerberCAM/gerberCAM v071/debug</value>
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/MalcStudio/CAM/gerberCAM/GerberCAM/release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
Expand Down Expand Up @@ -225,10 +225,10 @@
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">C:/Users/Lichao/Documents/gerberCAM/gerberCAM v071/debug/gerberCAM.exe</value>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">C:/MalcStudio/CAM/gerberCAM/GerberCAM/release/gerberCAM.exe</value>
<value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run C:\Users\Lichao\Documents\gerberCAM\gerberCAM v071\debug\gerberCAM.exe</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run C:\MalcStudio\CAM\gerberCAM\GerberCAM\release\gerberCAM.exe</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
Expand Down Expand Up @@ -276,8 +276,8 @@
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GerberCAM</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/MalcStudio/CAM/gerberCAM/GerberCAMv071/GerberCAM.pro</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">GerberCAM2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/MalcStudio/CAM/gerberCAM/GerberCAM/GerberCAM.pro</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">GerberCAM.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
Expand Down
86 changes: 44 additions & 42 deletions debug/Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#############################################################################
# Makefile for building: gerberCAM
# Generated by qmake (3.0) (Qt 5.4.0)
# Project: ..\gerberCAM.pro
# Project: ..\GerberCAM.pro
# Template: app
# Command: C:\Qt\5.4\mingw491_32\bin\qmake.exe -spec win32-g++ -o Makefile ..\gerberCAM.pro
# Command: C:\Qt\5.4\mingw491_32\bin\qmake.exe -spec win32-g++ CONFIG+=debug -o Makefile ..\GerberCAM.pro
#############################################################################

MAKEFILE = Makefile

first: release
install: release-install
uninstall: release-uninstall
first: debug
install: debug-install
uninstall: debug-uninstall
QMAKE = C:\Qt\5.4\mingw491_32\bin\qmake.exe
DEL_FILE = del
CHK_DIR_EXISTS= if not exist
Expand All @@ -26,24 +26,10 @@ SYMLINK = copy /y
DEL_DIR = rmdir
MOVE = move
SUBTARGETS = \
release \
debug
debug \
release


release: FORCE
$(MAKE) -f $(MAKEFILE).Release
release-make_first: FORCE
$(MAKE) -f $(MAKEFILE).Release
release-all: FORCE
$(MAKE) -f $(MAKEFILE).Release all
release-clean: FORCE
$(MAKE) -f $(MAKEFILE).Release clean
release-distclean: FORCE
$(MAKE) -f $(MAKEFILE).Release distclean
release-install: FORCE
$(MAKE) -f $(MAKEFILE).Release install
release-uninstall: FORCE
$(MAKE) -f $(MAKEFILE).Release uninstall
debug: FORCE
$(MAKE) -f $(MAKEFILE).Debug
debug-make_first: FORCE
Expand All @@ -58,8 +44,22 @@ debug-install: FORCE
$(MAKE) -f $(MAKEFILE).Debug install
debug-uninstall: FORCE
$(MAKE) -f $(MAKEFILE).Debug uninstall
release: FORCE
$(MAKE) -f $(MAKEFILE).Release
release-make_first: FORCE
$(MAKE) -f $(MAKEFILE).Release
release-all: FORCE
$(MAKE) -f $(MAKEFILE).Release all
release-clean: FORCE
$(MAKE) -f $(MAKEFILE).Release clean
release-distclean: FORCE
$(MAKE) -f $(MAKEFILE).Release distclean
release-install: FORCE
$(MAKE) -f $(MAKEFILE).Release install
release-uninstall: FORCE
$(MAKE) -f $(MAKEFILE).Release uninstall

Makefile: ../gerberCAM.pro C:/Qt/5.4/mingw491_32/mkspecs/win32-g++/qmake.conf C:/Qt/5.4/mingw491_32/mkspecs/features/spec_pre.prf \
Makefile: ../GerberCAM.pro C:/Qt/5.4/mingw491_32/mkspecs/win32-g++/qmake.conf C:/Qt/5.4/mingw491_32/mkspecs/features/spec_pre.prf \
C:/Qt/5.4/mingw491_32/mkspecs/qdevice.pri \
C:/Qt/5.4/mingw491_32/mkspecs/features/device_config.prf \
C:/Qt/5.4/mingw491_32/mkspecs/common/shell-win32.conf \
Expand Down Expand Up @@ -177,12 +177,13 @@ Makefile: ../gerberCAM.pro C:/Qt/5.4/mingw491_32/mkspecs/win32-g++/qmake.conf C:
C:/Qt/5.4/mingw491_32/mkspecs/features/exceptions.prf \
C:/Qt/5.4/mingw491_32/mkspecs/features/yacc.prf \
C:/Qt/5.4/mingw491_32/mkspecs/features/lex.prf \
../gerberCAM.pro \
C:/Qt/5.4/mingw491_32/lib/qtmain.prl \
C:/Qt/5.4/mingw491_32/lib/Qt5Core.prl \
../GerberCAM.pro \
C:/Qt/5.4/mingw491_32/lib/qtmaind.prl \
C:/Qt/5.4/mingw491_32/lib/Qt5Cored.prl \
C:/Qt/5.4/mingw491_32/lib/Qt5Widgets.prl \
C:/Qt/5.4/mingw491_32/lib/Qt5Gui.prl
$(QMAKE) -spec win32-g++ -o Makefile ..\gerberCAM.pro
C:/Qt/5.4/mingw491_32/lib/Qt5Gui.prl \
C:/Qt/5.4/mingw491_32/lib/Qt5Core.prl
$(QMAKE) -spec win32-g++ CONFIG+=debug -o Makefile ..\GerberCAM.pro
C:\Qt\5.4\mingw491_32\mkspecs\features\spec_pre.prf:
C:\Qt\5.4\mingw491_32\mkspecs\qdevice.pri:
C:\Qt\5.4\mingw491_32\mkspecs\features\device_config.prf:
Expand Down Expand Up @@ -301,36 +302,37 @@ C:\Qt\5.4\mingw491_32\mkspecs\features\testcase_targets.prf:
C:\Qt\5.4\mingw491_32\mkspecs\features\exceptions.prf:
C:\Qt\5.4\mingw491_32\mkspecs\features\yacc.prf:
C:\Qt\5.4\mingw491_32\mkspecs\features\lex.prf:
..\gerberCAM.pro:
C:/Qt/5.4/mingw491_32/lib/qtmain.prl:
C:/Qt/5.4/mingw491_32/lib/Qt5Core.prl:
..\GerberCAM.pro:
C:/Qt/5.4/mingw491_32/lib/qtmaind.prl:
C:/Qt/5.4/mingw491_32/lib/Qt5Cored.prl:
C:/Qt/5.4/mingw491_32/lib/Qt5Widgets.prl:
C:/Qt/5.4/mingw491_32/lib/Qt5Gui.prl:
C:/Qt/5.4/mingw491_32/lib/Qt5Core.prl:
qmake: FORCE
@$(QMAKE) -spec win32-g++ -o Makefile ..\gerberCAM.pro
@$(QMAKE) -spec win32-g++ CONFIG+=debug -o Makefile ..\GerberCAM.pro

qmake_all: FORCE

make_first: release-make_first debug-make_first FORCE
all: release-all debug-all FORCE
clean: release-clean debug-clean FORCE
distclean: release-distclean debug-distclean FORCE
make_first: debug-make_first release-make_first FORCE
all: debug-all release-all FORCE
clean: debug-clean release-clean FORCE
distclean: debug-distclean release-distclean FORCE
-$(DEL_FILE) Makefile

release-mocclean:
$(MAKE) -f $(MAKEFILE).Release mocclean
debug-mocclean:
$(MAKE) -f $(MAKEFILE).Debug mocclean
mocclean: release-mocclean debug-mocclean
release-mocclean:
$(MAKE) -f $(MAKEFILE).Release mocclean
mocclean: debug-mocclean release-mocclean

release-mocables:
$(MAKE) -f $(MAKEFILE).Release mocables
debug-mocables:
$(MAKE) -f $(MAKEFILE).Debug mocables
mocables: release-mocables debug-mocables
release-mocables:
$(MAKE) -f $(MAKEFILE).Release mocables
mocables: debug-mocables release-mocables

check: first
FORCE:

$(MAKEFILE).Release: Makefile
$(MAKEFILE).Debug: Makefile
$(MAKEFILE).Release: Makefile
378 changes: 116 additions & 262 deletions debug/Makefile.Debug

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions debug/Makefile.Release

Large diffs are not rendered by default.

Binary file modified debug/debug/clipper.o
Binary file not shown.
Binary file modified debug/debug/drawPCB.o
Binary file not shown.
Binary file modified debug/debug/gerber.o
Binary file not shown.
Binary file modified debug/debug/main.o
Binary file not shown.
Binary file modified debug/debug/mainwindow.o
Binary file not shown.
Binary file modified debug/debug/moc_mainwindow.o
Binary file not shown.
Binary file modified debug/debug/moc_settingwindow.o
Binary file not shown.
Binary file modified debug/debug/moc_treemodel.o
Binary file not shown.
Binary file modified debug/debug/preprocess.o
Binary file not shown.
6 changes: 3 additions & 3 deletions debug/debug/qrc_resources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*****************************************************************************/

static const unsigned char qt_resource_data[] = {
// C:/Users/Lichao/Documents/gerberCAM/gerberCAM v071/jpg/Conical.jpg
// C:/MalcStudio/CAM/gerberCAM/GerberCAM/jpg/Conical.jpg
0x0,0x0,0xa9,0x50,
0xff,
0xd8,0xff,0xe0,0x0,0x10,0x4a,0x46,0x49,0x46,0x0,0x1,0x2,0x1,0x0,0x90,0x0,
Expand Down Expand Up @@ -2719,7 +2719,7 @@ static const unsigned char qt_resource_data[] = {
0xeb,0xdd,0x7b,0xdf,0xba,0xf7,0x5e,0xf7,0xee,0xbd,0xd7,0xbd,0xfb,0xaf,0x75,0xef,
0x7e,0xeb,0xdd,0x7b,0xdf,0xba,0xf7,0x5e,0xf7,0xee,0xbd,0xd7,0xbd,0xfb,0xaf,0x75,
0xef,0x7e,0xeb,0xdd,0x7b,0xdf,0xba,0xf7,0x5e,0xf7,0xee,0xbd,0xd7,0xff,0xd9,
// C:/Users/Lichao/Documents/gerberCAM/gerberCAM v071/jpg/Drill.jpg
// C:/MalcStudio/CAM/gerberCAM/GerberCAM/jpg/Drill.jpg
0x0,0x0,0xa6,0x22,
0xff,
0xd8,0xff,0xe0,0x0,0x10,0x4a,0x46,0x49,0x46,0x0,0x1,0x2,0x1,0x0,0x90,0x0,
Expand Down Expand Up @@ -5381,7 +5381,7 @@ static const unsigned char qt_resource_data[] = {
0x75,0xef,0x7e,0xeb,0xdd,0x7b,0xdf,0xba,0xf7,0x5e,0xf7,0xee,0xbd,0xd7,0xbd,0xfb,
0xaf,0x75,0xef,0x7e,0xeb,0xdd,0x7b,0xdf,0xba,0xf7,0x5e,0xf7,0xee,0xbd,0xd7,0xff,
0xd9,
// C:/Users/Lichao/Documents/gerberCAM/gerberCAM v071/jpg/Cylindrical.jpg
// C:/MalcStudio/CAM/gerberCAM/GerberCAM/jpg/Cylindrical.jpg
0x0,0x0,0xb1,0xa7,
0xff,
0xd8,0xff,0xe0,0x0,0x10,0x4a,0x46,0x49,0x46,0x0,0x1,0x2,0x1,0x0,0x90,0x0,
Expand Down
Binary file modified debug/debug/qrc_resources.o
Binary file not shown.
Binary file modified debug/debug/setting.o
Binary file not shown.
Binary file modified debug/debug/settingwindow.o
Binary file not shown.
Binary file modified debug/debug/toolpath.o
Binary file not shown.
Binary file modified debug/debug/treeitem.o
Binary file not shown.
Binary file modified debug/debug/treemodel.o
Binary file not shown.
Binary file modified debug/gerberCAM.exe
Binary file not shown.
Binary file removed debug/release/clipper.o
Binary file not shown.
Binary file removed debug/release/drawPCB.o
Binary file not shown.
Binary file removed debug/release/gerber.o
Binary file not shown.
Binary file removed debug/release/gerberCAM.exe
Binary file not shown.
Binary file removed debug/release/main.o
Binary file not shown.
Binary file removed debug/release/mainwindow.o
Binary file not shown.
145 changes: 0 additions & 145 deletions debug/release/moc_mainwindow.cpp

This file was deleted.

Binary file removed debug/release/moc_mainwindow.o
Binary file not shown.
Loading

0 comments on commit d0688d2

Please sign in to comment.