cxgeorge 23 yıl önce
ebeveyn
işleme
e1508a1938

+ 31 - 29
dtool/src/dtoolbase/dllbase.txt

@@ -6,36 +6,38 @@
 
 
 ; release dlls
 ; release dlls
 
 
-libpanda         0x0000000060000000 0x004b0000
+libpanda         0x0000000060000000 0x004c0000
+libwindisplay    0x00000000604c0000 0x00010000
 libpandadx8      0x0000000061000000 0x00090000
 libpandadx8      0x0000000061000000 0x00090000
-libpandadx7      0x0000000061000000 0x00050000
-libpandagl       0x0000000061000000 0x00040000
-libpandaexpress  0x00000000605d0000 0x00140000
-libpandaphysics  0x0000000060710000 0x00060000
-libpandafx       0x0000000060770000 0x00020000
-libdtool         0x0000000060790000 0x00020000
-libdtoolconfig   0x00000000607b0000 0x00040000
-libpystub        0x00000000607f0000 0x00010000
-libdirect        0x0000000060800000 0x00050000
-libtoontown      0x0000000060850000 0x000b0000
-libmiles_audio   0x0000000060900000 0x00020000
-libpandaegg      0x0000000060920000 0x00130000
-libframework     0x0000000060a50000 0x00020000
+libpandadx7      0x0000000061000000 0x00040000
+libpandagl       0x0000000061000000 0x00030000
+libpandaexpress  0x00000000605d0000 0x00150000
+libpandaphysics  0x0000000060720000 0x00060000
+libpandafx       0x0000000060780000 0x00020000
+libdtool         0x00000000607a0000 0x00020000
+libdtoolconfig   0x00000000607c0000 0x00040000
+libpystub        0x0000000060800000 0x00010000
+libdirect        0x0000000060810000 0x00050000
+libtoontown      0x0000000060860000 0x000b0000
+libmiles_audio   0x0000000060910000 0x00020000
+libpandaegg      0x0000000060930000 0x00130000
+libframework     0x0000000060a60000 0x00020000
 
 
 ; debug dlls
 ; debug dlls
 
 
-libpanda_d       0x0000000060000000 0x007c0000
-libpandadx8_d    0x00000000607c0000 0x000f0000
-libpandadx7_d    0x00000000608b0000 0x00070000
-libpandagl_d     0x0000000060920000 0x00050000
-libpandaexpress_d 0x0000000060970000 0x00210000
-libpandaphysics_d 0x0000000060b80000 0x000a0000
-libpandafx_d     0x0000000060c20000 0x00030000
-libdtool_d       0x0000000060c50000 0x00030000
-libdtoolconfig_d 0x0000000060c80000 0x00070000
-libpystub_d      0x0000000060cf0000 0x00010000
-libdirect_d      0x0000000060d00000 0x00080000
-libtoontown_d    0x0000000060d80000 0x00130000
-libmiles_audio_d 0x0000000060eb0000 0x00030000
-libpandaegg_d    0x0000000060ee0000 0x00210000
-libframework_d   0x00000000610f0000 0x00030000
+libpanda_d       0x0000000060000000 0x007e0000
+libwindisplay_d  0x00000000607e0000 0x00020000
+libpandadx8_d    0x0000000060800000 0x000d0000
+libpandadx7_d    0x00000000608d0000 0x00060000
+libpandagl_d     0x0000000060930000 0x00040000
+libpandaexpress_d 0x0000000060970000 0x00220000
+libpandaphysics_d 0x0000000060b90000 0x000a0000
+libpandafx_d     0x0000000060c30000 0x00030000
+libdtool_d       0x0000000060c60000 0x00030000
+libdtoolconfig_d 0x0000000060c90000 0x00070000
+libpystub_d      0x0000000060d00000 0x00010000
+libdirect_d      0x0000000060d10000 0x00080000
+libtoontown_d    0x0000000060d90000 0x00130000
+libmiles_audio_d 0x0000000060ec0000 0x00030000
+libpandaegg_d    0x0000000060ef0000 0x00210000
+libframework_d   0x0000000061100000 0x00030000

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

@@ -12,7 +12,7 @@ $rebase_path="/msvc7/Common7/Tools/bin";
 $ENV{'PATH'}=$rebase_path.":".$ENV{'PATH'};
 $ENV{'PATH'}=$rebase_path.":".$ENV{'PATH'};
 
 
 # note: this is the order dlls will be laid out in memory
 # 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","libframework");
+@dll_names=("libpanda","libwindisplay","libpandadx8","libpandadx7","libpandagl","libpandaexpress","libpandaphysics","libpandafx","libdtool","libdtoolconfig","libpystub","libdirect","libtoontown","libmiles_audio","libpandaegg","libframework");
 
 
 # old audio dlls
 # old audio dlls
 #            "libaudio_load_midi","libaudio_load_mp3","libaudio_load_st","libaudio_load_wav",
 #            "libaudio_load_midi","libaudio_load_mp3","libaudio_load_st","libaudio_load_wav",