Changed main include file for smoother integration process: Profiler.…

…h => Brofiler.h
bombomby · Jul 7, 2015 · fd5d55f · fd5d55f
1 parent 7ecb66b
commit fd5d55f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/PrepareVersion.cmd b/PrepareVersion.cmd
@@ -0,0 +1,15 @@
+xcopy /Y Release\Win32\EasyHook32.dll ..\publish\EasyHook32.dll
+xcopy /Y Release\Win32\ProfilerCore32.dll ..\publish\ProfilerCore32.dll
+xcopy /Y Release\Win32\ProfilerCore32.lib ..\publish\ProfilerCore32.lib
+xcopy /Y Release\Win32\ProfilerCore32.pdb ..\publish\ProfilerCore32.pdb
+xcopy /Y Release\Win32\ProfilerTest32.exe ..\publish\ProfilerTest32.exe
+xcopy /Y Release\Win32\ProfilerTest32.pdb ..\publish\ProfilerTest32.pdb
+xcopy /Y Release\x64\EasyHook64.dll ..\publish\EasyHook64.dll
+xcopy /Y Release\x64\ProfilerCore64.dll ..\publish\ProfilerCore64.dll
+xcopy /Y Release\x64\ProfilerCore64.lib ..\publish\ProfilerCore64.lib
+xcopy /Y Release\x64\ProfilerCore64.pdb ..\publish\ProfilerCore64.pdb
+xcopy /Y Release\x64\ProfilerTest64.exe ..\publish\ProfilerTest64.exe
+xcopy /Y Release\x64\ProfilerTest64.pdb ..\publish\ProfilerTest64.pdb
+xcopy /Y Release\x64\Brofiler.exe ..\publish\Brofiler.exe
+xcopy /Y ProfilerCore\Brofiler.h ..\publish\Brofiler.h
+
diff --git a/ProfilerCore/Profiler.h → ProfilerCore/Brofiler.h b/ProfilerCore/Profiler.h → ProfilerCore/Brofiler.h
diff --git a/ProfilerCore/Common.h b/ProfilerCore/Common.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Types.h"
-#include "Profiler.h"
+#include "Brofiler.h"
 
 // MEMORY //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #define BRO_CACHE_LINE_SIZE 64

diff --git a/ProfilerCore/ProfilerCore.vcxproj b/ProfilerCore/ProfilerCore.vcxproj
@@ -321,7 +321,7 @@
     <ClInclude Include="Common.h" />
     <ClInclude Include="HPTimer.h" />
     <ClInclude Include="Message.h" />
-    <ClInclude Include="Profiler.h" />
+    <ClInclude Include="Brofiler.h" />
     <ClInclude Include="ProfilerServer.h" />
     <ClInclude Include="Sampler.h" />
     <ClInclude Include="Serialization.h" />

diff --git a/ProfilerCore/ProfilerCore.vcxproj.filters b/ProfilerCore/ProfilerCore.vcxproj.filters
@@ -27,9 +27,6 @@
     </ClInclude>
     <ClInclude Include="Sampler.h" />
     <ClInclude Include="EventDescriptionBoard.h" />
-    <ClInclude Include="Profiler.h">
-      <Filter>API</Filter>
-    </ClInclude>
     <ClInclude Include="Core.h" />
     <ClInclude Include="Thread.h">
       <Filter>Tools</Filter>
@@ -53,6 +50,9 @@
       <Filter>Tools</Filter>
     </ClInclude>
     <ClInclude Include="Event.h" />
+    <ClInclude Include="Brofiler.h">
+      <Filter>API</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Tools">

diff --git a/ProfilerTest/TestEngine.cpp b/ProfilerTest/TestEngine.cpp
@@ -1,6 +1,6 @@
 #include "TestEngine.h"
 #include "..\ProfilerCore\Types.h"
-#include "..\ProfilerCore\Profiler.h"
+#include "..\ProfilerCore\Brofiler.h"
 #include <math.h>
 #include <vector>