From 7e2110eaf5f2b9ffee0a9cb38ba65d2bd1564264 Mon Sep 17 00:00:00 2001
From: Par Winzell <zell@threerings.net>
Date: Fri, 13 Jun 2008 00:51:46 +0000
Subject: [PATCH] Be less promiscuous about swc's here too.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@624 c613c5cb-e716-0410-b11b-feb51c14d237
---
 build.xml               | 29 -----------------------------
 etc/aslib-config.xml.in |  3 ++-
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/build.xml b/build.xml
index 1ffb42ef..2049c3fc 100644
--- a/build.xml
+++ b/build.xml
@@ -214,35 +214,6 @@
     <delete file="${deploy.dir}/aslib-config.xml"/>
   </target>
 
-  <!-- checks whether our thane library needs building -->
-  <target name="checkabclib">
-    <condition property="no_build_abclib"><or>
-      <not><available classname="macromedia.asc.embedding.ScriptCompiler"
-                      classpathref="classpath"/></not>
-      <uptodate targetfile="${deploy.dir}/${lib.name}-abc.abc">
-        <srcfiles dir="src/as" includes="**/*.as"/>
-        <srcfiles dir="etc" includes="asc-files-*.txt"/>
-        <srcfiles dir="${deploy.dir}/lib" includes="*.abc"/>
-      </uptodate>
-    </or></condition>
-  </target>
-
-  <!-- builds our thane library -->
-  <target name="abclib" unless="no_build_abclib" depends="checkabclib">
-    <taskdef name="asc" classname="flex.ant.AscTask" classpathref="classpath"/>
-    <asc as3="true" strict="true" classpathref="classpath" use="AS3">
-      <import dir="${deploy.dir}/lib">
-        <include name="tamarin-builtin*.abc"/>
-        <include name="thane*.abc"/>
-        <include name="narya-abc*.abc"/>
-      </import>
-      <in dir="src/as"><includesfile name="etc/asc-files-00.txt"/></in>
-      <in dir="src/as"><includesfile name="etc/asc-files-01.txt"/></in>
-      <filespec dir="etc" includes="empty.as"/>
-    </asc>
-    <move overwrite="true" file="etc/empty.abc" tofile="${deploy.dir}/${lib.name}-abc.abc"/>
-  </target>
-
   <!-- builds the javadoc documentation -->
   <target name="javadoc" depends="prepare">
     <javadoc sourcepath="src/java" packagenames="com.threerings.*"
diff --git a/etc/aslib-config.xml.in b/etc/aslib-config.xml.in
index 5c767151..d7eb69b6 100644
--- a/etc/aslib-config.xml.in
+++ b/etc/aslib-config.xml.in
@@ -43,7 +43,8 @@
       <!-- compiler.external-library-path: list of SWC files or directories to compile against but to omit from linking-->
       <external-library-path>
          <path-element>@flex_sdk_dir@/frameworks/libs/player/playerglobal.swc</path-element>
-         <path-element>lib</path-element>
+         <path-element>lib/naryalib.swc</path-element>
+         <path-element>lib/nenyalib.swc</path-element>
          <path-element>@flex_sdk_dir@/frameworks/libs</path-element>
          <path-element>@flex_sdk_dir@/frameworks/libs/player</path-element>
          <path-element>@flex_sdk_dir@/frameworks/locale/{locale}</path-element>