diff --git a/CrossBench/CrossBench.mk b/CrossBench/CrossBench.mk
index 7e7e00e..866f8e6 100644
--- a/CrossBench/CrossBench.mk
+++ b/CrossBench/CrossBench.mk
@@ -13,7 +13,7 @@ CurrentFileName        :=
 CurrentFilePath        :=
 CurrentFileFullPath    :=
 User                   :=Aleksey Lobanov
-Date                   :=18/06/15
+Date                   :=22/06/15
 CodeLitePath           :="/home/alex/.codelite"
 LinkerName             :=/usr/bin/g++-4.8
 SharedObjectLinkerName :=/usr/bin/g++-4.8 -shared -fPIC
@@ -60,7 +60,7 @@ AS       := /usr/bin/as
 ## User defined environment variables
 ##
 CodeLiteDir:=/usr/share/codelite
-Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) 
+Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_crossexport.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_crossgen.cpp$(ObjectSuffix) 
 
 
 
@@ -95,6 +95,22 @@ $(IntermediateDirectory)/main.cpp$(DependSuffix): main.cpp
 $(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp
 	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/main.cpp$(PreprocessSuffix) "main.cpp"
 
+$(IntermediateDirectory)/src_crossexport.cpp$(ObjectSuffix): ../src/crossexport.cpp $(IntermediateDirectory)/src_crossexport.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/data/Sync/SyncProjects/CrossGen/src/crossexport.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_crossexport.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_crossexport.cpp$(DependSuffix): ../src/crossexport.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_crossexport.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/src_crossexport.cpp$(DependSuffix) -MM "../src/crossexport.cpp"
+
+$(IntermediateDirectory)/src_crossexport.cpp$(PreprocessSuffix): ../src/crossexport.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_crossexport.cpp$(PreprocessSuffix) "../src/crossexport.cpp"
+
+$(IntermediateDirectory)/src_crossgen.cpp$(ObjectSuffix): ../src/crossgen.cpp $(IntermediateDirectory)/src_crossgen.cpp$(DependSuffix)
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/data/Sync/SyncProjects/CrossGen/src/crossgen.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_crossgen.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_crossgen.cpp$(DependSuffix): ../src/crossgen.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_crossgen.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/src_crossgen.cpp$(DependSuffix) -MM "../src/crossgen.cpp"
+
+$(IntermediateDirectory)/src_crossgen.cpp$(PreprocessSuffix): ../src/crossgen.cpp
+	@$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_crossgen.cpp$(PreprocessSuffix) "../src/crossgen.cpp"
+
 
 -include $(IntermediateDirectory)/*$(DependSuffix)
 ##
diff --git a/CrossBench/CrossBench.project b/CrossBench/CrossBench.project
index 17dfacf..3c647f2 100644
--- a/CrossBench/CrossBench.project
+++ b/CrossBench/CrossBench.project
@@ -94,4 +94,11 @@
       </Completion>
     </Configuration>
   </Settings>
+  <VirtualDirectory Name="Shared">
+    <File Name="../src/crossbasetypes.hpp"/>
+    <File Name="../src/crossexport.cpp"/>
+    <File Name="../src/crossexport.hpp"/>
+    <File Name="../src/crossgen.cpp"/>
+    <File Name="../src/crossgen.hpp"/>
+  </VirtualDirectory>
 </CodeLite_Project>
diff --git a/CrossBench/CrossBench.txt b/CrossBench/CrossBench.txt
index 65da2a2..fb09a88 100644
--- a/CrossBench/CrossBench.txt
+++ b/CrossBench/CrossBench.txt
@@ -1 +1 @@
-./Release/main.cpp.o
+./Release/main.cpp.o ./Release/src_crossexport.cpp.o ./Release/src_crossgen.cpp.o
diff --git a/Makefile b/Makefile
index c1fa320..68fba5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 .PHONY: clean All
 
 All:
-	@echo "----------Building project:[ wxCrossGen - Release ]----------"
-	@cd "wxCrossGen" && $(MAKE) -f  "wxCrossGen.mk"
+	@echo "----------Building project:[ CrossBench - Release ]----------"
+	@cd "CrossBench" && $(MAKE) -f  "CrossBench.mk"
 clean:
-	@echo "----------Cleaning project:[ wxCrossGen - Release ]----------"
-	@cd "wxCrossGen" && $(MAKE) -f  "wxCrossGen.mk" clean
+	@echo "----------Cleaning project:[ CrossBench - Release ]----------"
+	@cd "CrossBench" && $(MAKE) -f  "CrossBench.mk" clean