Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

do not overwrite existing resources in TestLua

This commit is contained in:
ivzave 2013-01-12 15:07:21 +04:00
parent 03f1efff78
commit 737fc4ce9e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/Lua/TestLua/proj.linux/.cproject
View File

@ -14,7 +14,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.684675641" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug" prebuildStep="mkdir -p bin &amp;&amp; cp -R ../../../../../samples/Cpp/TestCpp/Resources ../../../../../samples/Lua/TestLua/ &amp;&amp; rm ../../../../../samples/Lua/TestLua/Resources/.gitignore">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.684675641" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug" prebuildStep="mkdir -p bin &amp;&amp; cp -R -n ../../../../../samples/Cpp/TestCpp/Resources ../../../../../samples/Lua/TestLua/">
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.684675641." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1168665521" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.2039781202" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
@ -111,7 +111,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.890968076" name="Release" parent="cdt.managedbuild.config.gnu.exe.release" prebuildStep="mkdir -p bin &amp;&amp; cp -R ../../../../../samples/Cpp/TestCpp/Resources ../../../../../samples/Lua/TestLua/ &amp;&amp; rm ../../../../../samples/Lua/TestLua/Resources/.gitignore">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.890968076" name="Release" parent="cdt.managedbuild.config.gnu.exe.release" prebuildStep="mkdir -p bin &amp;&amp; cp -R -n ../../../../../samples/Cpp/TestCpp/Resources ../../../../../samples/Lua/TestLua/">
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.890968076." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.720811514" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.962949232" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
@ -203,7 +203,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.684675641.877862202" name="Debug64" parent="cdt.managedbuild.config.gnu.exe.debug" prebuildStep="mkdir -p bin &amp;&amp; cp -R ../../../../../samples/Cpp/TestCpp/Resources ../../../../../samples/Lua/TestLua/ &amp;&amp; rm ../../../../../samples/Lua/TestLua/Resources/.gitignore">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.684675641.877862202" name="Debug64" parent="cdt.managedbuild.config.gnu.exe.debug" prebuildStep="mkdir -p bin &amp;&amp; cp -R -n ../../../../../samples/Cpp/TestCpp/Resources ../../../../../samples/Lua/TestLua/">
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.684675641.877862202." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1546937154" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1457614998" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
@ -300,7 +300,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.890968076.613854536" name="Release64" parent="cdt.managedbuild.config.gnu.exe.release" prebuildStep="mkdir -p bin &amp;&amp; cp -R ../../../../../samples/Cpp/TestCpp/Resources ../../../../../samples/Lua/TestLua/ &amp;&amp; rm ../../../../../samples/Lua/TestLua/Resources/.gitignore">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.890968076.613854536" name="Release64" parent="cdt.managedbuild.config.gnu.exe.release" prebuildStep="mkdir -p bin &amp;&amp; cp -R -n ../../../../../samples/Cpp/TestCpp/Resources ../../../../../samples/Lua/TestLua/">
<folderInfo id="cdt.managedbuild.config.gnu.exe.release.890968076.613854536." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.965057447" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.864921619" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>

2
samples/Lua/TestLua/proj.linux/Makefile
View File

@ -86,7 +86,7 @@ release: $(TARGET)
####### Build rules
$(TARGET): $(OBJECTS)
mkdir -p $(BIN_DIR)
cp -R ../../../../samples/Cpp/TestCpp/Resources ../../../../samples/Lua/TestLua
cp -R -n ../../../../samples/Cpp/TestCpp/Resources ../../../../samples/Lua/TestLua
$(CXX) $(CXXFLAGS) $(INCLUDES) $(DEFINES) $(OBJECTS) -o $(BIN_DIR)/$(TARGET) $(SHAREDLIBS) $(STATICLIBS)
####### Compile