fix for MFilePath under Linux

1 files changed, 51 insertions, 72 deletions

diff --git a/src/mir_app/mir_app.mk b/src/mir_app/mir_app.mk
index 3a0088b7a6..fa8afdc03a 100644
--- a/src/mir_app/mir_app.mk
+++ b/src/mir_app/mir_app.mk
@@ -5,17 +5,18 @@
 ## Debug
 ProjectName            :=mir_app
 ConfigurationName      :=Debug
-WorkspaceConfiguration := $(ConfigurationName)
-WorkspacePath          :=/var/www/miranda-ng/codelite
-ProjectPath            :=/var/www/miranda-ng/src/mir_app
-IntermediateDirectory  :=../../codelite/build-$(ConfigurationName)/__/src/mir_app
-OutDir                 :=../../codelite/build-$(ConfigurationName)/__/src/mir_app
+WorkspaceConfiguration :=Debug
+WorkspacePath          :=/home/ghazan/miranda-ng/codelite
+ProjectPath            :=/home/ghazan/miranda-ng/src/mir_app
+IntermediateDirectory  :=../../codelite/obj/debug/$(ProjectName)
+OutDir                 :=$(IntermediateDirectory)
 CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=George Hazan
-Date                   :=15/03/22
+Date                   :=10/05/22
 CodeLitePath           :=/home/ghazan/.codelite
+MakeDirCommand         :=mkdir -p
 LinkerName             :=g++
 SharedObjectLinkerName :=g++ -shared -fPIC
 ObjectSuffix           :=.o
@@ -28,7 +29,8 @@ OutputSwitch           :=-o
 LibraryPathSwitch      :=-L
 PreprocessorSwitch     :=-D
 SourceSwitch           :=-c 
-OutputFile             :=../../codelite/build-$(ConfigurationName)/lib/$(ProjectName)
+OutputDirectory        :=/home/ghazan/miranda-ng/codelite/build-$(WorkspaceConfiguration)/lib
+OutputFile             :=../../codelite/build-$(WorkspaceConfiguration)/lib/$(ProjectName)
 Preprocessors          :=
 ObjectSwitch           :=-o 
 ArchiveOutputSwitch    := 
@@ -45,7 +47,7 @@ LibPath                := $(LibraryPathSwitch).
 
 ##
 ## Common variables
-## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overriden using an environment variables
+## AR, CXX, CC, AS, CXXFLAGS and CFLAGS can be overridden using an environment variable
 ##
 AR       := ar rcus
 CXX      := g++
@@ -60,7 +62,7 @@ AS       := as
 ## User defined environment variables
 ##
 CodeLiteDir:=/usr/share/codelite
-Objects0=../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_intf.cpp$(ObjectSuffix) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_events.cpp$(ObjectSuffix) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_addcontact.cpp$(ObjectSuffix) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_contact.cpp$(ObjectSuffix) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_stdafx.cxx$(ObjectSuffix) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_database.cpp$(ObjectSuffix) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_CMPluginBase.cpp$(ObjectSuffix) 
+Objects0=$(IntermediateDirectory)/src_database.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_db_intf.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_db_events.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_contact.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_CMPluginBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_addcontact.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) 
 
 
 
@@ -72,19 +74,19 @@ Objects=$(Objects0)
 .PHONY: all clean PreBuild PrePreBuild PostBuild MakeIntermediateDirs
 all: MakeIntermediateDirs $(OutputFile)
 
-$(OutputFile): ../../codelite/build-$(ConfigurationName)/__/src/mir_app/.d $(Objects) 
-	@mkdir -p "../../codelite/build-$(ConfigurationName)/__/src/mir_app"
+$(OutputFile): $(IntermediateDirectory)/.d $(Objects) 
+	@$(MakeDirCommand) "$(IntermediateDirectory)"
 	@echo "" > $(IntermediateDirectory)/.d
 	@echo $(Objects0)  > $(ObjectsFileList)
 	$(SharedObjectLinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)
 	@echo rebuilt > $(IntermediateDirectory)/mir_app.relink
 
 MakeIntermediateDirs:
-	@mkdir -p "../../codelite/build-$(ConfigurationName)/__/src/mir_app"
-	@mkdir -p ""../../codelite/build-$(ConfigurationName)/lib""
+	@$(MakeDirCommand) "$(IntermediateDirectory)"
+	@$(MakeDirCommand) "$(OutputDirectory)"
 
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/.d:
-	@mkdir -p "../../codelite/build-$(ConfigurationName)/__/src/mir_app"
+$(IntermediateDirectory)/.d:
+	@$(MakeDirCommand) "$(IntermediateDirectory)"
 
 PreBuild:
 
@@ -92,64 +94,41 @@ PreBuild:
 ##
 ## Objects
 ##
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_intf.cpp$(ObjectSuffix): src/db_intf.cpp ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_intf.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_app/src/db_intf.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_db_intf.cpp$(ObjectSuffix) $(IncludePath)
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_intf.cpp$(DependSuffix): src/db_intf.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_intf.cpp$(ObjectSuffix) -MF../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_intf.cpp$(DependSuffix) -MM src/db_intf.cpp
+$(IntermediateDirectory)/src_database.cpp$(ObjectSuffix): src/database.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_app/src/database.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_database.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_database.cpp$(PreprocessSuffix): src/database.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_database.cpp$(PreprocessSuffix) src/database.cpp
+
+$(IntermediateDirectory)/src_db_intf.cpp$(ObjectSuffix): src/db_intf.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_app/src/db_intf.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_db_intf.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_db_intf.cpp$(PreprocessSuffix): src/db_intf.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_db_intf.cpp$(PreprocessSuffix) src/db_intf.cpp
+
+$(IntermediateDirectory)/src_db_events.cpp$(ObjectSuffix): src/db_events.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_app/src/db_events.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_db_events.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_db_events.cpp$(PreprocessSuffix): src/db_events.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_db_events.cpp$(PreprocessSuffix) src/db_events.cpp
+
+$(IntermediateDirectory)/src_contact.cpp$(ObjectSuffix): src/contact.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_app/src/contact.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_contact.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_contact.cpp$(PreprocessSuffix): src/contact.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_contact.cpp$(PreprocessSuffix) src/contact.cpp
+
+$(IntermediateDirectory)/src_CMPluginBase.cpp$(ObjectSuffix): src/CMPluginBase.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_app/src/CMPluginBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_CMPluginBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_CMPluginBase.cpp$(PreprocessSuffix): src/CMPluginBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_CMPluginBase.cpp$(PreprocessSuffix) src/CMPluginBase.cpp
+
+$(IntermediateDirectory)/src_addcontact.cpp$(ObjectSuffix): src/addcontact.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_app/src/addcontact.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_addcontact.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_addcontact.cpp$(PreprocessSuffix): src/addcontact.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_addcontact.cpp$(PreprocessSuffix) src/addcontact.cpp
+
+$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix): src/stdafx.cxx 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_app/src/stdafx.cxx" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_stdafx.cxx$(PreprocessSuffix): src/stdafx.cxx
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_stdafx.cxx$(PreprocessSuffix) src/stdafx.cxx
 
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_intf.cpp$(PreprocessSuffix): src/db_intf.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_intf.cpp$(PreprocessSuffix) src/db_intf.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_events.cpp$(ObjectSuffix): src/db_events.cpp ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_events.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_app/src/db_events.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_db_events.cpp$(ObjectSuffix) $(IncludePath)
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_events.cpp$(DependSuffix): src/db_events.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_events.cpp$(ObjectSuffix) -MF../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_events.cpp$(DependSuffix) -MM src/db_events.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_events.cpp$(PreprocessSuffix): src/db_events.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_db_events.cpp$(PreprocessSuffix) src/db_events.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_addcontact.cpp$(ObjectSuffix): src/addcontact.cpp ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_addcontact.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_app/src/addcontact.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_addcontact.cpp$(ObjectSuffix) $(IncludePath)
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_addcontact.cpp$(DependSuffix): src/addcontact.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_addcontact.cpp$(ObjectSuffix) -MF../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_addcontact.cpp$(DependSuffix) -MM src/addcontact.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_addcontact.cpp$(PreprocessSuffix): src/addcontact.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_addcontact.cpp$(PreprocessSuffix) src/addcontact.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_contact.cpp$(ObjectSuffix): src/contact.cpp ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_contact.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_app/src/contact.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_contact.cpp$(ObjectSuffix) $(IncludePath)
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_contact.cpp$(DependSuffix): src/contact.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_contact.cpp$(ObjectSuffix) -MF../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_contact.cpp$(DependSuffix) -MM src/contact.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_contact.cpp$(PreprocessSuffix): src/contact.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_contact.cpp$(PreprocessSuffix) src/contact.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_stdafx.cxx$(ObjectSuffix): src/stdafx.cxx ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_stdafx.cxx$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_app/src/stdafx.cxx" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IncludePath)
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_stdafx.cxx$(DependSuffix): src/stdafx.cxx
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_stdafx.cxx$(ObjectSuffix) -MF../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_stdafx.cxx$(DependSuffix) -MM src/stdafx.cxx
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_stdafx.cxx$(PreprocessSuffix): src/stdafx.cxx
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_stdafx.cxx$(PreprocessSuffix) src/stdafx.cxx
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_database.cpp$(ObjectSuffix): src/database.cpp ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_database.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_app/src/database.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_database.cpp$(ObjectSuffix) $(IncludePath)
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_database.cpp$(DependSuffix): src/database.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_database.cpp$(ObjectSuffix) -MF../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_database.cpp$(DependSuffix) -MM src/database.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_database.cpp$(PreprocessSuffix): src/database.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_database.cpp$(PreprocessSuffix) src/database.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_CMPluginBase.cpp$(ObjectSuffix): src/CMPluginBase.cpp ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_CMPluginBase.cpp$(DependSuffix)
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/var/www/miranda-ng/src/mir_app/src/CMPluginBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_CMPluginBase.cpp$(ObjectSuffix) $(IncludePath)
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_CMPluginBase.cpp$(DependSuffix): src/CMPluginBase.cpp
-	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_CMPluginBase.cpp$(ObjectSuffix) -MF../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_CMPluginBase.cpp$(DependSuffix) -MM src/CMPluginBase.cpp
-
-../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_CMPluginBase.cpp$(PreprocessSuffix): src/CMPluginBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) ../../codelite/build-$(ConfigurationName)/__/src/mir_app/src_CMPluginBase.cpp$(PreprocessSuffix) src/CMPluginBase.cpp
-
-
--include ../../codelite/build-$(ConfigurationName)/__/src/mir_app//*$(DependSuffix)
 ##
 ## Clean
 ##