Skip to content

Commit

Permalink
Merge pull request #285 from adamfowleruk/develop
Browse files Browse the repository at this point in the history 
Merge in build fix to master
  • Loading branch information
@adamfowleruk
adamfowleruk authored Dec 16, 2019
2 parents 403d5a4 + 1b3676e commit ef42b06
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ Paladin/Templates/Sample\ ListItems/ListItems
Paladin/Templates/Sample\ LoadResources/LoadResources
Paladin/Templates/Sample\ MenuBar/MenuBar
Paladin/compile_commands.json
SymbolFinder/compile_commands.json


0 Paladin/CompileCommand.cpp → Paladin/BuildSystem/CompileCommand.cpp
View file
File renamed without changes.
0 Paladin/CompileCommand.h → Paladin/BuildSystem/CompileCommand.h
View file
File renamed without changes.
0 Paladin/CompileCommandWriter.cpp → Paladin/BuildSystem/CompileCommandWriter.cpp
View file
File renamed without changes.
0 Paladin/CompileCommandWriter.h → Paladin/BuildSystem/CompileCommandWriter.h
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions Paladin/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ SRCS = AboutWindow.cpp \
TemplateWindow.cpp \
TerminalWindow.cpp \
BuildSystem/BuildInfo.cpp \
BuildSystem/CompileCommand.cpp \
BuildSystem/CompileCommandWriter.cpp \
BuildSystem/ErrorParser.cpp \
BuildSystem/FileFactory.cpp \
BuildSystem/ProjectBuilder.cpp \
Expand Down
16 changes: 8 additions & 8 deletions Paladin/Paladin.pld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ DEPENDENCY=AppDebug.h|Project.h|BuildSystem/BuildInfo.h|ThirdParty/DPath.h|Build
SOURCEFILE=DebugTools.cpp
DEPENDENCY=DebugTools.h
SOURCEFILE=ErrorWindow.cpp
DEPENDENCY=ErrorWindow.h|BuildSystem/ErrorParser.h|ThirdParty/DListView.h|DebugTools.h|MsgDefs.h|Project.h|BuildSystem/BuildInfo.h|ThirdParty/DPath.h|BuildSystem/ErrorParser.h|ProjectPath.h|ProjectPath.h|BuildSystem/ProjectBuilder.h|CompileCommand.h|ProjectWindow.h|ProjectStatus.h|ProjectSettingsWindow.h|ThirdParty/AutoTextControl.h
DEPENDENCY=ErrorWindow.h|BuildSystem/ErrorParser.h|ThirdParty/DListView.h|DebugTools.h|MsgDefs.h|Project.h|BuildSystem/BuildInfo.h|ThirdParty/DPath.h|BuildSystem/ErrorParser.h|ProjectPath.h|ProjectPath.h|BuildSystem/ProjectBuilder.h|BuildSystem/CompileCommand.h|ProjectWindow.h|ProjectStatus.h|ProjectSettingsWindow.h|ThirdParty/AutoTextControl.h
SOURCEFILE=FileActions.cpp
DEPENDENCY=FileActions.h|ThirdParty/DPath.h|Globals.h|CodeLib.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|BuildSystem/ErrorParser.h|ProjectPath.h|BuildSystem/ErrorParser.h|ProjectPath.h|DebugTools.h
SOURCEFILE=FileUtils.cpp
Expand All @@ -43,7 +43,7 @@ DEPENDENCY=LibWindow.h|ThirdParty/DWindow.h|Globals.h|CodeLib.h|ThirdParty/DPath
SOURCEFILE=Makemake.cpp
DEPENDENCY=Makemake.h|ThirdParty/DPath.h|Project.h|BuildSystem/BuildInfo.h|BuildSystem/ErrorParser.h|ProjectPath.h|BuildSystem/ErrorParser.h|ProjectPath.h|Makefile.h|BuildSystem/SourceFile.h
SOURCEFILE=Paladin.cpp
DEPENDENCY=Paladin.h|AboutWindow.h|DebugTools.h|ThirdParty/DPath.h|BuildSystem/ErrorParser.h|FileUtils.h|Globals.h|CodeLib.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|BuildSystem/ErrorParser.h|ProjectPath.h|ProjectPath.h|ThirdParty/LaunchHelper.h|Makemake.h|MsgDefs.h|BuildSystem/ProjectBuilder.h|CompileCommand.h|ProjectWindow.h|ProjectStatus.h|ProjectSettingsWindow.h|ThirdParty/AutoTextControl.h|SourceControl/SCMManager.h|SourceControl/SourceControl.h|Project.h|ThirdParty/Settings.h|BuildSystem/SourceFile.h|StartWindow.h|TemplateWindow.h|TemplateManager.h|PaladinFileFilter.h
DEPENDENCY=Paladin.h|AboutWindow.h|DebugTools.h|ThirdParty/DPath.h|BuildSystem/ErrorParser.h|FileUtils.h|Globals.h|CodeLib.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|BuildSystem/ErrorParser.h|ProjectPath.h|ProjectPath.h|ThirdParty/LaunchHelper.h|Makemake.h|MsgDefs.h|BuildSystem/ProjectBuilder.h|BuildSystem/CompileCommand.h|ProjectWindow.h|ProjectStatus.h|ProjectSettingsWindow.h|ThirdParty/AutoTextControl.h|SourceControl/SCMManager.h|SourceControl/SourceControl.h|Project.h|ThirdParty/Settings.h|BuildSystem/SourceFile.h|StartWindow.h|TemplateWindow.h|TemplateManager.h|PaladinFileFilter.h
SOURCEFILE=Paladin.rdef
SOURCEFILE=PaladinFileFilter.cpp
DEPENDENCY=PaladinFileFilter.h|Project.h|BuildSystem/BuildInfo.h|ThirdParty/DPath.h|BuildSystem/ErrorParser.h|ProjectPath.h|BuildSystem/ErrorParser.h|ProjectPath.h
Expand All @@ -60,7 +60,7 @@ DEPENDENCY=ProjectSettingsWindow.h|ThirdParty/AutoTextControl.h|ThirdParty/DList
SOURCEFILE=ProjectStatus.cpp
DEPENDENCY=ProjectStatus.h
SOURCEFILE=ProjectWindow.cpp
DEPENDENCY=ProjectWindow.h|BuildSystem/ProjectBuilder.h|CompileCommand.h|BuildSystem/ErrorParser.h|ProjectStatus.h|ProjectSettingsWindow.h|ThirdParty/AutoTextControl.h|AddNewFileWindow.h|ThirdParty/DWindow.h|AltTabFilter.h|MsgDefs.h|AppDebug.h|AsciiWindow.h|CodeLibWindow.h|CodeLib.h|ThirdParty/DPath.h|DebugTools.h|BuildSystem/ErrorParser.h|ErrorWindow.h|FileActions.h|BuildSystem/FileFactory.h|BuildSystem/SourceType.h|FindOpenFileWindow.h|FindWindow.h|ThirdParty/GetTextWindow.h|ThirdParty/DWindow.h|Globals.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|ProjectPath.h|ProjectPath.h|GroupRenameWindow.h|ThirdParty/LaunchHelper.h|LibWindow.h|LicenseManager.h|Makemake.h|Paladin.h|PrefsWindow.h|ProjectList.h|QuickFindWindow.h|RunArgsWindow.h|SourceControl/SCMManager.h|SourceControl/SourceControl.h|Project.h|SourceControl/SCMOutputWindow.h|ThirdParty/Settings.h|BuildSystem/SourceFile.h|VRegWindow.h
DEPENDENCY=ProjectWindow.h|BuildSystem/ProjectBuilder.h|BuildSystem/CompileCommand.h|BuildSystem/ErrorParser.h|ProjectStatus.h|ProjectSettingsWindow.h|ThirdParty/AutoTextControl.h|AddNewFileWindow.h|ThirdParty/DWindow.h|AltTabFilter.h|MsgDefs.h|AppDebug.h|AsciiWindow.h|CodeLibWindow.h|CodeLib.h|ThirdParty/DPath.h|DebugTools.h|BuildSystem/ErrorParser.h|ErrorWindow.h|FileActions.h|BuildSystem/FileFactory.h|BuildSystem/SourceType.h|FindOpenFileWindow.h|FindWindow.h|ThirdParty/GetTextWindow.h|ThirdParty/DWindow.h|Globals.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|ProjectPath.h|ProjectPath.h|GroupRenameWindow.h|ThirdParty/LaunchHelper.h|LibWindow.h|LicenseManager.h|Makemake.h|Paladin.h|PrefsWindow.h|ProjectList.h|QuickFindWindow.h|RunArgsWindow.h|SourceControl/SCMManager.h|SourceControl/SourceControl.h|Project.h|SourceControl/SCMOutputWindow.h|ThirdParty/Settings.h|BuildSystem/SourceFile.h|VRegWindow.h
SOURCEFILE=QuickFindWindow.cpp
DEPENDENCY=QuickFindWindow.h|ThirdParty/AutoTextControl.h|DebugTools.h|ThirdParty/EscapeCancelFilter.h|Globals.h|CodeLib.h|ThirdParty/DPath.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|BuildSystem/ErrorParser.h|ProjectPath.h|BuildSystem/ErrorParser.h|ProjectPath.h|MsgDefs.h
SOURCEFILE=RunArgsWindow.cpp
Expand All @@ -78,16 +78,16 @@ GROUP=Build System
EXPANDGROUP=yes
SOURCEFILE=BuildSystem/BuildInfo.cpp
DEPENDENCY=BuildSystem/BuildInfo.h|ThirdParty/DPath.h|BuildSystem/ErrorParser.h|ProjectPath.h
SOURCEFILE=CompileCommand.cpp
DEPENDENCY=CompileCommand.h
SOURCEFILE=CompileCommandWriter.cpp
DEPENDENCY=CompileCommandWriter.h|CompileCommand.h
SOURCEFILE=BuildSystem/CompileCommand.cpp
DEPENDENCY=BuildSystem/CompileCommand.h
SOURCEFILE=BuildSystem/CompileCommandWriter.cpp
DEPENDENCY=BuildSystem/CompileCommandWriter.h|BuildSystem/CompileCommand.h
SOURCEFILE=BuildSystem/ErrorParser.cpp
DEPENDENCY=BuildSystem/ErrorParser.h
SOURCEFILE=BuildSystem/FileFactory.cpp
DEPENDENCY=BuildSystem/FileFactory.h|BuildSystem/SourceType.h|ThirdParty/DPath.h|BuildSystem/SourceTypeC.h|BuildSystem/ErrorParser.h|BuildSystem/SourceFile.h|BuildSystem/SourceTypeLex.h|BuildSystem/SourceTypeLib.h|BuildSystem/SourceTypeResource.h|BuildSystem/SourceTypeRez.h|BuildSystem/SourceTypeShell.h|BuildSystem/SourceTypeText.h|BuildSystem/SourceTypeYacc.h
SOURCEFILE=BuildSystem/ProjectBuilder.cpp
DEPENDENCY=BuildSystem/ProjectBuilder.h|CompileCommand.h|BuildSystem/ErrorParser.h|CompileCommandWriter.h|DebugTools.h|Globals.h|CodeLib.h|ThirdParty/DPath.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|ProjectPath.h|BuildSystem/ErrorParser.h|ProjectPath.h|ThirdParty/LaunchHelper.h|Project.h|BuildSystem/SourceFile.h|BuildSystem/StatCache.h|TerminalWindow.h|ThirdParty/DWindow.h
DEPENDENCY=BuildSystem/ProjectBuilder.h|BuildSystem/CompileCommand.h|BuildSystem/ErrorParser.h|BuildSystem/CompileCommandWriter.h|DebugTools.h|Globals.h|CodeLib.h|ThirdParty/DPath.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|ProjectPath.h|BuildSystem/ErrorParser.h|ProjectPath.h|ThirdParty/LaunchHelper.h|Project.h|BuildSystem/SourceFile.h|BuildSystem/StatCache.h|TerminalWindow.h|ThirdParty/DWindow.h
SOURCEFILE=BuildSystem/SourceFile.cpp
DEPENDENCY=BuildSystem/SourceFile.h|ThirdParty/DPath.h|BuildSystem/ErrorParser.h|BuildSystem/BuildInfo.h|ProjectPath.h|Globals.h|CodeLib.h|ThirdParty/LockableList.h|Project.h|BuildSystem/BuildInfo.h|BuildSystem/ErrorParser.h|ProjectPath.h|BuildSystem/StatCache.h
SOURCEFILE=BuildSystem/SourceType.cpp
Expand Down

0 comments on commit ef42b06

Please sign in to comment.