修正几个lua工程的编译错误

xinyuelh · Jan 15, 2014 · 8d91882 · 8d91882
1 parent 9c3ff7c
commit 8d91882
Show file tree

Hide file tree

Showing 34 changed files with 557 additions and 8,198 deletions.
diff --git a/Development/Editor/Core/Script/Python/complie.py b/Development/Editor/Core/Script/Python/complie.py
@@ -16,11 +16,6 @@ def run_bat(bat_path, cmd=None):
  p = subprocess.Popen(cmd, cwd=str(bat_path.parent_path()), stdin=open(os.devnull), stderr=subprocess.PIPE, stdout=subprocess.PIPE, shell=True)
  for line in p.stdout.readlines():
  print(line)
-
-def complie_opensource(configuration):
- util.msvc.rebuild(path['OpenSource']/ 'Lua' / 'Current' / 'makefiles' / 'luacore.sln', configuration)
- util.msvc.rebuild(path['OpenSource']/ 'LuaBind' / 'Current' / 'makefiles' / 'luabind.sln', configuration)
- util.msvc.rebuild(path['OpenSource']/ 'luaffi' / 'makefiles' / 'luaffi.sln', configuration)
 
 def copy_crt_dll(configuration):
  if configuration == 'Release':
@@ -35,7 +30,8 @@ def complie(configuration):
  print('msvc.setup_env')
  util.msvc.setup_env()
  print('rebuild opensource')
- complie_opensource(configuration)
+ util.msvc.rebuild(path['OpenSource']/ 'Lua' / 'Current' / 'makefiles' / 'luacore.sln', configuration)
+ util.msvc.rebuild(path['OpenSource']/ 'luaffi' / 'makefiles' / 'luaffi.sln', configuration)
  print('rebuild ydwe')
  util.msvc.rebuild(path['BuildRoot']/ 'Editor' / 'Core' / 'Solution' / 'YDWE.sln', configuration) 
  util.msvc.rebuild(path['BuildRoot']/ 'Editor' / 'Plugin' / 'YDColorizer' / 'YDColorizer.sln', configuration, 'Any CPU')

diff --git a/Development/Editor/Core/Script/Python/copy_all.py b/Development/Editor/Core/Script/Python/copy_all.py
@@ -51,7 +51,6 @@ def copy_all(configuration):
  copy_lib_dll('APR-Util', configuration)
  copy_lib_dll('Log4CXX', configuration)
  copy_lib_dll('Lua', configuration)
- copy_lib_dll('LuaBind', configuration)
  copy_lib_dll('StormLib', configuration)
  fs.copy_file(path['OpenSource'] / 'luaffi' / 'bin' / configuration / 'ffi.dll', path['ResultCore'] / 'modules' / 'ffi.dll')
  copy_lua_script()

diff --git a/Development/Editor/Core/Solution/ydwe_build.props b/Development/Editor/Core/Solution/ydwe_build.props
@@ -27,7 +27,7 @@
  <AdditionalIncludeDirectories>$(YDWE)\Editor\Build\include;$(YDWE)\Editor\Core;$(YDWE)\Editor\Core\YDWEBase;$(YDWE)\Editor\Core\SlkLib;$(YDWE)\Editor\Core\YDWEVersion;$(OpenSource)\Aero\Current\include;$(OpenSource)\APR\Current\include;$(OpenSource)\APR-Util\Current\include;$(OpenSource)\Boost;$(OpenSource)\CImg\Current;$(OpenSource)\Log4CXX\Current\include;$(OpenSource)\Lua\Current\include;$(OpenSource)\LuaBind\Current\include;$(OpenSource)\StormLib\Current\include;$(ThirdParty)\Blizzard\Storm\Current\include;$(ThirdParty)\Microsoft\Detours\Current\include;$(ThirdParty)\RadGameTools\MSS\6.1a\Includes;%(AdditionalLibraryDirectories)</AdditionalIncludeDirectories>
  </ClCompile>
  <Link>
- <AdditionalLibraryDirectories>$(OpenSource)\APR\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\APR-Util\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\Boost\stage\lib;$(OpenSource)\Log4CXX\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\Lua\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\LuaBind\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\StormLib\Current\lib\$(PlatformName)\$(ConfigurationName);$(ThirdParty)\Blizzard\Storm\Current\lib\Win32\DebugRelease;$(ThirdParty)\Microsoft\Detours\Current\lib\$(PlatformName)\$(ConfigurationName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OpenSource)\APR\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\APR-Util\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\Boost\stage\lib;$(OpenSource)\Log4CXX\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\Lua\Current\lib\$(PlatformName)\$(ConfigurationName);$(OpenSource)\StormLib\Current\lib\$(PlatformName)\$(ConfigurationName);$(ThirdParty)\Blizzard\Storm\Current\lib\Win32\DebugRelease;$(ThirdParty)\Microsoft\Detours\Current\lib\$(PlatformName)\$(ConfigurationName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  </Link>
  <ResourceCompile>
  <IgnoreStandardIncludePath>

diff --git a/OpenSource/Lua/Current/makefiles/lpeg.vcxproj b/OpenSource/Lua/Current/makefiles/lpeg.vcxproj
diff --git a/OpenSource/Lua/Current/makefiles/lpeg.vcxproj.filters b/OpenSource/Lua/Current/makefiles/lpeg.vcxproj.filters
diff --git a/OpenSource/Lua/Current/makefiles/lua.vcxproj b/OpenSource/Lua/Current/makefiles/lua.vcxproj
@@ -55,6 +55,7 @@
  <Optimization>Disabled</Optimization>
  <PreprocessorDefinitions>LUA_COMPAT_ALL;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>..\include;$(ProjectDir)\..\..\..\luabind\current\include;$(ProjectDir)\..\..\..\Boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4996</DisableSpecificWarnings>
  </ClCompile>
  <Link>
  <SubSystem>Console</SubSystem>
@@ -72,6 +73,7 @@
  <IntrinsicFunctions>true</IntrinsicFunctions>
  <PreprocessorDefinitions>LUA_COMPAT_ALL;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <AdditionalIncludeDirectories>..\include;$(ProjectDir)\..\..\..\luabind\current\include;$(ProjectDir)\..\..\..\Boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <DisableSpecificWarnings>4996</DisableSpecificWarnings>
  </ClCompile>
  <Link>
  <SubSystem>Console</SubSystem>
@@ -86,7 +88,7 @@
  <ClCompile Include="..\src\luabind.cpp" />
  </ItemGroup>
  <ItemGroup>
- <ProjectReference Include="..\..\..\LuaBind\Current\makefiles\luabind.vcxproj">
+ <ProjectReference Include="luabind.vcxproj">
  <Project>{506832ce-f522-43d8-867d-5c97a9d6552a}</Project>
  </ProjectReference>
  <ProjectReference Include="luacore.vcxproj">