diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-26 16:38:08 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-05-26 16:38:08 +0000 |
| commit | 9a9de7689176de013872e5a6a5367f79202d0844 (patch) | |
| tree | aaf098cfd51175b9e1d675fd21373d0c3de5ef8d /nGenEx | |
| parent | 75f9af66439ec416634188eb3ef020df4e4752b7 (diff) | |
| download | starshatter-9a9de7689176de013872e5a6a5367f79202d0844.zip starshatter-9a9de7689176de013872e5a6a5367f79202d0844.tar.gz starshatter-9a9de7689176de013872e5a6a5367f79202d0844.tar.bz2 | |
Getting closer to getting magic to compile. The file renaming was necessary in order to remove a conflict between the WinSDK's locale.h and starshatter's own version.
Diffstat (limited to 'nGenEx')
| -rw-r--r-- | nGenEx/ContentBundle.h | 2 | ||||
| -rw-r--r-- | nGenEx/Locale_ss.cpp (renamed from nGenEx/Locale.cpp) | 2 | ||||
| -rw-r--r-- | nGenEx/Locale_ss.h (renamed from nGenEx/Locale.h) | 0 | ||||
| -rw-r--r-- | nGenEx/nGenEx.vcxproj | 4 | ||||
| -rw-r--r-- | nGenEx/nGenEx.vcxproj.filters | 12 |
5 files changed, 10 insertions, 10 deletions
diff --git a/nGenEx/ContentBundle.h b/nGenEx/ContentBundle.h index d0c103b..4848716 100644 --- a/nGenEx/ContentBundle.h +++ b/nGenEx/ContentBundle.h @@ -18,7 +18,7 @@ #include "Types.h"
#include "Dictionary.h"
#include "Text.h"
-#include "Locale.h"
+#include "Locale_ss.h"
// +--------------------------------------------------------------------+
diff --git a/nGenEx/Locale.cpp b/nGenEx/Locale_ss.cpp index 1e7d511..9a87650 100644 --- a/nGenEx/Locale.cpp +++ b/nGenEx/Locale_ss.cpp @@ -13,7 +13,7 @@ */
#include "MemDebug.h"
-#include "Locale.h"
+#include "Locale_ss.h"
void Print(const char* fmt, ...);
diff --git a/nGenEx/Locale.h b/nGenEx/Locale_ss.h index 551c379..551c379 100644 --- a/nGenEx/Locale.h +++ b/nGenEx/Locale_ss.h diff --git a/nGenEx/nGenEx.vcxproj b/nGenEx/nGenEx.vcxproj index 9a0b68d..3b9f232 100644 --- a/nGenEx/nGenEx.vcxproj +++ b/nGenEx/nGenEx.vcxproj @@ -373,7 +373,7 @@ <ClCompile Include="Layout.cpp" />
<ClCompile Include="Light.cpp" />
<ClCompile Include="ListBox.cpp" />
- <ClCompile Include="Locale.cpp" />
+ <ClCompile Include="Locale_ss.cpp" />
<ClCompile Include="MachineInfo.cpp" />
<ClCompile Include="MCIWave.cpp" />
<ClCompile Include="..\FoundationEx\MemDebug.cpp" />
@@ -461,7 +461,7 @@ <ClInclude Include="Layout.h" />
<ClInclude Include="Light.h" />
<ClInclude Include="ListBox.h" />
- <ClInclude Include="Locale.h" />
+ <ClInclude Include="Locale_ss.h" />
<ClInclude Include="MachineInfo.h" />
<ClInclude Include="MCIWave.h" />
<ClInclude Include="..\FoundationEx\MemDebug.h" />
diff --git a/nGenEx/nGenEx.vcxproj.filters b/nGenEx/nGenEx.vcxproj.filters index b31e5e7..e5049f1 100644 --- a/nGenEx/nGenEx.vcxproj.filters +++ b/nGenEx/nGenEx.vcxproj.filters @@ -119,9 +119,6 @@ <ClCompile Include="ListBox.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Locale.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="MachineInfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -257,6 +254,9 @@ <ClCompile Include="Window.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="Locale_ss.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="ActiveWindow.h">
@@ -379,9 +379,6 @@ <ClInclude Include="ListBox.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Locale.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="MachineInfo.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -538,6 +535,9 @@ <ClInclude Include="Window.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="Locale_ss.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\FoundationEx\Dictionary.inl">
|