Skip to content

Commit

Permalink
Additional Updates for Android and Linux
Browse files Browse the repository at this point in the history 
A few adjustments to fix or update the Android and Linux builds
  • Loading branch information
@greenfire27
greenfire27 committed May 7, 2018
1 parent 2351cf8 commit d9fde89
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 52 deletions.
15 changes: 8 additions & 7 deletions engine/compilers/Make/Torque2D
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,15 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/assets/assetTagsManifest.cc \
../../source/assets/declaredAssets.cc \
../../source/assets/referencedAssets.cc \
../../source/audio/audio.cc \
../../source/audio/audioDataBlock.cc \
../../source/audio/audioDescriptions.cc \
../../source/audio/audio_ScriptBinding.cc \
../../source/audio/audioStreamSourceFactory.cc \
../../source/audio/wavStreamSource.cc \
../../source/audio/AudioAsset.cc \
../../source/audio/audioBuffer.cc \
../../source/audio/vorbisStreamSource.cc \
../../source/bitmapFont/BitmapFont.cc \
../../source/bitmapFont/BitmapFontCharacter.cc \
../../source/Box2D/Collision/b2BroadPhase.cpp \
Expand Down Expand Up @@ -242,13 +250,6 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/persistence/tinyXML/tinyxml.cpp \
../../source/persistence/tinyXML/tinyxmlerror.cpp \
../../source/persistence/tinyXML/tinyxmlparser.cpp \
../../source/audio/vorbisStreamSource.cc \
../../source/audio/audio.cc \
../../source/audio/audioBuffer.cc \
../../source/audio/audioDataBlock.cc \
../../source/audio/audio_ScriptBinding.cc \
../../source/audio/audioStreamSourceFactory.cc \
../../source/audio/wavStreamSource.cc \
../../source/component/dynamicConsoleMethodComponent.cpp \
../../source/component/simComponent.cpp \
../../source/component/behaviors/behaviorComponent.cpp \
Expand Down
14 changes: 7 additions & 7 deletions engine/compilers/Make/ljpeg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# I release this sample under the MIT license: free for any use, provided
# you hold me harmless from any such use you make, and you retain my
# you hold me harmless from any such use you make, and you retain my
# copyright on the actual sources.
# Copyright 2005 Jon Watte.

Expand Down Expand Up @@ -79,27 +79,27 @@ LIB_TARGETS_DEBUG += $(TARGET_ljpeg_DEBUG)
OBJS_ljpeg := $(patsubst ../../lib/ljpeg/%,Release/ljpeg/%.o,$(SOURCES))
OBJS_ljpeg_DEBUG := $(patsubst ../../lib/ljpeg/%,Debug/ljpeg/%.o,$(SOURCES))

# Deriving the variable name from the target name is the secret sauce
# Deriving the variable name from the target name is the secret sauce
# of the build system.
#
$(TARGET_ljpeg): $(OBJS_ljpeg)
@echo Linking library ljpng
@echo Linking library ljpng
@mkdir -p $(dir $@)
ar cr $@ $(OBJS_ljpeg)

$(TARGET_ljpeg_DEBUG): $(OBJS_ljpeg_DEBUG)
@echo Linking debug library ljpng
@echo Linking debug library ljpng
@mkdir -p $(dir $@)
ar cr $@ $(OBJS_ljpeg_DEBUG)

Release/ljpeg/%.o: ../../lib/ljpeg/%
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS_ljpeg) $< -o $@

Debug/ljpeg/%.o: ../../lib/ljpeg/%
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS_DEBUG_ljpeg) $< -o $@

release_ljpeg: $(TARGET_ljpeg)
debug_ljpeg: $(TARGET_ljpeg_DEBUG)

Expand Down
Binary file modified engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Browse.VC.db
View file
Binary file not shown.
Binary file modified engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Solution.VC.db
View file
Binary file not shown.
59 changes: 21 additions & 38 deletions engine/compilers/android-studio/app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
Expand All @@ -21,11 +26,6 @@
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
Expand Down Expand Up @@ -55,14 +55,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
Expand All @@ -71,6 +63,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
Expand All @@ -80,14 +80,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
Expand All @@ -96,33 +88,24 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndkBuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
Expand Down
3 changes: 3 additions & 0 deletions engine/compilers/android-studio/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
buildscript {
repositories {
jcenter()
maven {
url "https://maven.google.com"
}
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
Expand Down

0 comments on commit d9fde89

Please sign in to comment.