Browse Source

*** empty log message ***

cxgeorge 23 years ago
parent
commit
a8894d5815
2 changed files with 30 additions and 26 deletions
  1. 28 25
      dtool/src/dtoolbase/dllbase.txt
  2. 2 1
      pandatool/src/scripts/basedlls.pl

+ 28 - 25
dtool/src/dtoolbase/dllbase.txt

@@ -6,34 +6,37 @@
 
 ; release dlls
 
-libpanda         0x0000000060000000 0x004c0000
-libpandadx       0x0000000061000000 0x00080000
+libpanda         0x0000000060000000 0x004a0000
+libpandadx       0x0000000061000000 0x00090000
 libpandadx7      0x0000000061000000 0x00050000
 libpandagl       0x0000000061000000 0x00040000
 libpandaexpress  0x0000000062000000 0x000a0000
-libpandaphysics  0x0000000060670000 0x00060000
-libpandafx       0x00000000606d0000 0x00020000
-libdtool         0x00000000606f0000 0x00020000
-libdtoolconfig   0x0000000060710000 0x00040000
-libpystub        0x0000000060750000 0x00010000
-libdirect        0x0000000060760000 0x00030000
-libtoontown      0x0000000060790000 0x000a0000
-libmiles_audio   0x0000000060830000 0x00020000
-libpandaegg      0x0000000060850000 0x00120000
+libpandaphysics  0x0000000060660000 0x00060000
+libpandafx       0x00000000606c0000 0x00020000
+libdtool         0x00000000606e0000 0x00020000
+libdtoolconfig   0x0000000060700000 0x00040000
+libpystub        0x0000000060740000 0x00010000
+libdirect        0x0000000060750000 0x00030000
+libtoontown      0x0000000060780000 0x000a0000
+libmiles_audio   0x0000000060820000 0x00020000
+libpandaegg      0x0000000060840000 0x00120000
+libframework     0x0000000060960000 0x00020000
 
 ; debug dlls
 
-libpanda_d       0x0000000060000000 0x007e0000
-libpandadx_d     0x00000000607e0000 0x000e0000
-libpandadx7_d    0x00000000608c0000 0x00070000
-libpandagl_d     0x0000000060930000 0x00050000
-libpandaexpress_d 0x0000000060980000 0x00100000
-libpandaphysics_d 0x0000000060a80000 0x000a0000
-libpandafx_d     0x0000000060b20000 0x00030000
-libdtool_d       0x0000000060b50000 0x00030000
-libdtoolconfig_d 0x0000000060b80000 0x00080000
-libpystub_d      0x0000000060c00000 0x00010000
-libdirect_d      0x0000000060c10000 0x00050000
-libtoontown_d    0x0000000060c60000 0x00110000
-libmiles_audio_d 0x0000000060d70000 0x00030000
-libpandaegg_d    0x0000000060da0000 0x00210000
+libpanda_d       0x0000000060000000 0x007a0000
+libpandadx_d     0x00000000607a0000 0x000e0000
+libpandadx7_d    0x0000000060880000 0x00070000
+libpandagl_d     0x00000000608f0000 0x00050000
+libpandaexpress_d 0x0000000060940000 0x00100000
+libpandaphysics_d 0x0000000060a40000 0x000a0000
+libpandafx_d     0x0000000060ae0000 0x00030000
+libdtool_d       0x0000000060b10000 0x00030000
+libdtoolconfig_d 0x0000000060b40000 0x00080000
+libpystub_d      0x0000000060bc0000 0x00010000
+libdirect_d      0x0000000060bd0000 0x00050000
+libtoontown_d    0x0000000060c20000 0x00110000
+libmiles_audio_d 0x0000000060d30000 0x00030000
+libpandaegg_d    0x0000000060d60000 0x00210000
+libframework_d   0x0000000060f70000 0x00030000
+

+ 2 - 1
pandatool/src/scripts/basedlls.pl

@@ -12,7 +12,7 @@ $rebase_path="/msvc7/Common7/Tools/bin";
 $ENV{'PATH'}=$rebase_path.":".$ENV{'PATH'};
 
 # note: this is the order dlls will be laid out in memory
-@dll_names=("libpanda","libpandadx","libpandadx7","libpandagl","libpandaexpress","libpandaphysics","libpandafx","libdtool","libdtoolconfig","libpystub","libdirect","libtoontown","libmiles_audio","libpandaegg");
+@dll_names=("libpanda","libpandadx","libpandadx7","libpandagl","libpandaexpress","libpandaphysics","libpandafx","libdtool","libdtoolconfig","libpystub","libdirect","libtoontown","libmiles_audio","libpandaegg","libframework");
 
 # old audio dlls
 #            "libaudio_load_midi","libaudio_load_mp3","libaudio_load_st","libaudio_load_wav",
@@ -105,3 +105,4 @@ print $args[0]." ".$args[1]." ".$args[2]."\n";
 system(@args);
 
 exit(0);
+