Ver código fonte

build: rename “core” directory to “base” because the former is used for core

files on some Unix systems.
legacy
Sam Hocevar sam 13 anos atrás
pai
commit
d49bb04d20
10 arquivos alterados com 16 adições e 16 exclusões
  1. +3
    -3
      src/Makefile.am
  2. +0
    -0
      src/base/hash.cpp
  3. +0
    -0
      src/base/string.cpp
  4. +5
    -5
      src/core.h
  5. +0
    -0
      src/lol/base/array.h
  6. +0
    -0
      src/lol/base/hash.h
  7. +0
    -0
      src/lol/base/map.h
  8. +1
    -1
      src/lol/base/string.h
  9. +0
    -0
      src/lol/base/types.h
  10. +7
    -7
      src/lolcore.vcxproj

+ 3
- 3
src/Makefile.am Ver arquivo

@@ -17,8 +17,8 @@ liblol_a_SOURCES = \
platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \ platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
\ \
lol/unit.h lol/debug.h \ lol/unit.h lol/debug.h \
lol/core/types.h lol/core/array.h lol/core/string.h lol/core/hash.h \
lol/core/map.h \
lol/base/types.h lol/base/array.h lol/base/string.h lol/base/hash.h \
lol/base/map.h \
lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \ lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
lol/math/math.h \ lol/math/math.h \
\ \
@@ -40,7 +40,7 @@ liblol_a_SOURCES = \
$(d3d9_sources) \ $(d3d9_sources) \
$(android_sources) \ $(android_sources) \
\ \
core/hash.cpp core/string.cpp \
base/hash.cpp base/string.cpp \
\ \
thread/threadbase.h thread/thread.h \ thread/threadbase.h thread/thread.h \
\ \


src/core/hash.cpp → src/base/hash.cpp Ver arquivo


src/core/string.cpp → src/base/string.cpp Ver arquivo


+ 5
- 5
src/core.h Ver arquivo

@@ -76,11 +76,11 @@ static inline int isnan(float f)
// Base types // Base types
#include <lol/debug.h> #include <lol/debug.h>


#include <lol/core/types.h>
#include <lol/core/array.h>
#include <lol/core/string.h>
#include <lol/core/hash.h>
#include <lol/core/map.h>
#include <lol/base/types.h>
#include <lol/base/array.h>
#include <lol/base/string.h>
#include <lol/base/hash.h>
#include <lol/base/map.h>


#include <lol/math/math.h> #include <lol/math/math.h>
#include <lol/math/half.h> #include <lol/math/half.h>


src/lol/core/array.h → src/lol/base/array.h Ver arquivo


src/lol/core/hash.h → src/lol/base/hash.h Ver arquivo


src/lol/core/map.h → src/lol/base/map.h Ver arquivo


src/lol/core/string.h → src/lol/base/string.h Ver arquivo

@@ -17,7 +17,7 @@
#if !defined __LOL_CORE_STRING_H__ #if !defined __LOL_CORE_STRING_H__
#define __LOL_CORE_STRING_H__ #define __LOL_CORE_STRING_H__


#include <lol/core/array.h>
#include <lol/base/array.h>


namespace lol namespace lol
{ {

src/lol/core/types.h → src/lol/base/types.h Ver arquivo


+ 7
- 7
src/lolcore.vcxproj Ver arquivo

@@ -234,8 +234,8 @@
<ClCompile Include="bullet\LinearMath\btQuickprof.cpp" /> <ClCompile Include="bullet\LinearMath\btQuickprof.cpp" />
<ClCompile Include="bullet\LinearMath\btSerializer.cpp" /> <ClCompile Include="bullet\LinearMath\btSerializer.cpp" />
<ClCompile Include="camera.cpp" /> <ClCompile Include="camera.cpp" />
<ClCompile Include="core\hash.cpp" />
<ClCompile Include="core\string.cpp" />
<ClCompile Include="base\hash.cpp" />
<ClCompile Include="base\string.cpp" />
<ClCompile Include="debug\fps.cpp" /> <ClCompile Include="debug\fps.cpp" />
<ClCompile Include="debug\record.cpp" /> <ClCompile Include="debug\record.cpp" />
<ClCompile Include="debug\stats.cpp" /> <ClCompile Include="debug\stats.cpp" />
@@ -582,11 +582,11 @@
<ClInclude Include="log.h" /> <ClInclude Include="log.h" />
<ClInclude Include="loldebug.h" /> <ClInclude Include="loldebug.h" />
<ClInclude Include="lolgl.h" /> <ClInclude Include="lolgl.h" />
<ClInclude Include="lol\core\array.h" />
<ClInclude Include="lol\core\hash.h" />
<ClInclude Include="lol\core\map.h" />
<ClInclude Include="lol\core\string.h" />
<ClInclude Include="lol\core\types.h" />
<ClInclude Include="lol\base\array.h" />
<ClInclude Include="lol\base\hash.h" />
<ClInclude Include="lol\base\map.h" />
<ClInclude Include="lol\base\string.h" />
<ClInclude Include="lol\base\types.h" />
<ClInclude Include="lol\debug.h" /> <ClInclude Include="lol\debug.h" />
<ClInclude Include="lol\math\half.h" /> <ClInclude Include="lol\math\half.h" />
<ClInclude Include="lol\math\math.h" /> <ClInclude Include="lol\math\math.h" />


Carregando…
Cancelar
Salvar