Explorar o código

don't depend on converter

David Rose %!s(int64=23) %!d(string=hai) anos
pai
achega
cd42ed6917

+ 0 - 4
pandatool/src/converter/Sources.pp

@@ -8,14 +8,10 @@
     m
     m
 
 
   #define SOURCES \
   #define SOURCES \
-    animationConvert.cxx animationConvert.h \
-    distanceUnit.cxx distanceUnit.h \
     somethingToEggConverter.I somethingToEggConverter.cxx \
     somethingToEggConverter.I somethingToEggConverter.cxx \
     somethingToEggConverter.h
     somethingToEggConverter.h
 
 
   #define INSTALL_HEADERS \
   #define INSTALL_HEADERS \
-    animationConvert.h \
-    distanceUnit.h \
     somethingToEggConverter.I somethingToEggConverter.h
     somethingToEggConverter.I somethingToEggConverter.h
 
 
 #end ss_lib_target
 #end ss_lib_target

+ 4 - 0
pandatool/src/pandatoolbase/Sources.pp

@@ -2,9 +2,13 @@
   #define TARGET pandatoolbase
   #define TARGET pandatoolbase
   
   
   #define SOURCES \
   #define SOURCES \
+    animationConvert.cxx animationConvert.h \
+    distanceUnit.cxx distanceUnit.h \
     pandatoolbase.cxx pandatoolbase.h pandatoolsymbols.h
     pandatoolbase.cxx pandatoolbase.h pandatoolsymbols.h
 
 
   #define INSTALL_HEADERS \
   #define INSTALL_HEADERS \
+    animationConvert.h \
+    distanceUnit.h \
     pandatoolbase.h pandatoolsymbols.h
     pandatoolbase.h pandatoolsymbols.h
 
 
 #end ss_lib_target
 #end ss_lib_target

+ 0 - 0
pandatool/src/converter/animationConvert.cxx → pandatool/src/pandatoolbase/animationConvert.cxx


+ 0 - 0
pandatool/src/converter/animationConvert.h → pandatool/src/pandatoolbase/animationConvert.h


+ 2 - 2
pandatool/src/converter/distanceUnit.cxx → pandatool/src/pandatoolbase/distanceUnit.cxx

@@ -18,8 +18,8 @@
 
 
 #include "distanceUnit.h"
 #include "distanceUnit.h"
 
 
-#include <string_utils.h>
-#include <notify.h>
+#include "string_utils.h"
+#include "notify.h"
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //     Function: format_abbrev_unit
 //     Function: format_abbrev_unit

+ 1 - 1
pandatool/src/converter/distanceUnit.h → pandatool/src/pandatoolbase/distanceUnit.h

@@ -19,7 +19,7 @@
 #ifndef DISTANCEUNIT_H
 #ifndef DISTANCEUNIT_H
 #define DISTANCEUNIT_H
 #define DISTANCEUNIT_H
 
 
-#include <pandatoolbase.h>
+#include "pandatoolbase.h"
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 //        Enum : DistanceUnit
 //        Enum : DistanceUnit

+ 1 - 1
pandatool/src/progbase/Sources.pp

@@ -1,7 +1,7 @@
 #begin ss_lib_target
 #begin ss_lib_target
   #define TARGET progbase
   #define TARGET progbase
   #define LOCAL_LIBS \
   #define LOCAL_LIBS \
-    converter pandatoolbase
+    pandatoolbase
   #define OTHER_LIBS \
   #define OTHER_LIBS \
     pnmimage:c linmath:c putil:c express:c panda:m pystub dtool
     pnmimage:c linmath:c putil:c express:c panda:m pystub dtool