TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

build on windows

Browse Source
This commit is contained in:
David Rose 2003-02-05 00:16:53 +00:00
parent 6884f6265e
commit 3dfa9c5a58
14 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/downloader/httpDate.I
View File

@ -117,6 +117,16 @@ operator < (const HTTPDate &other) const {
return _time < other._time; return _time < other._time;
} }
////////////////////////////////////////////////////////////////////
// Function: HTTPDate::Operator >
// Access: Published
// Description:
////////////////////////////////////////////////////////////////////
INLINE bool HTTPDate::
operator > (const HTTPDate &other) const {
return _time > other._time;
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: HTTPDate::compare_to // Function: HTTPDate::compare_to
// Access: Published // Access: Published

3
panda/src/downloader/httpDate.h
View File

@ -21,6 +21,8 @@
#include "pandabase.h" #include "pandabase.h"
#include <time.h>
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : HTTPDate // Class : HTTPDate
// Description : A container for an HTTP-legal time/date indication. // Description : A container for an HTTP-legal time/date indication.
@ -46,6 +48,7 @@ PUBLISHED:
INLINE bool operator == (const HTTPDate &other) const; INLINE bool operator == (const HTTPDate &other) const;
INLINE bool operator != (const HTTPDate &other) const; INLINE bool operator != (const HTTPDate &other) const;
INLINE bool operator < (const HTTPDate &other) const; INLINE bool operator < (const HTTPDate &other) const;
INLINE bool operator > (const HTTPDate &other) const;
INLINE int compare_to(const HTTPDate &other) const; INLINE int compare_to(const HTTPDate &other) const;
INLINE void operator += (int seconds); INLINE void operator += (int seconds);

5
pandaapp/src/httpbackup/Sources.pp
View File

@ -6,9 +6,10 @@
#define USE_PACKAGES ssl #define USE_PACKAGES ssl
#define OTHER_LIBS \ #define OTHER_LIBS \
progbase \ progbase pandatoolbase \
express:c downloader:c pandaexpress:m \ express:c downloader:c pandaexpress:m \
panda:m panda:m dtool:m dtoolconfig:m \
pystub
#define SOURCES \ #define SOURCES \
backupCatalog.I backupCatalog.cxx backupCatalog.h \ backupCatalog.I backupCatalog.cxx backupCatalog.h \

3
pandaapp/src/httpbackup/httpBackup.cxx
View File

@ -240,7 +240,8 @@ post_command_line() {
bool HTTPBackup:: bool HTTPBackup::
dispatch_url(const string &opt, const string &arg, void *var) { dispatch_url(const string &opt, const string &arg, void *var) {
URLSpec *up = (URLSpec *)var; URLSpec *up = (URLSpec *)var;
(*up) = URLSpec(arg); URLSpec new_url(arg);
(*up) = new_url;
return true; return true;
} }

10
pandaapp/src/indexify/Sources.pp
View File

@ -3,8 +3,9 @@
#define TARGET indexify #define TARGET indexify
#define OTHER_LIBS \ #define OTHER_LIBS \
progbase \ progbase pandatoolbase \
pnmimage:c pnmimagetypes:c panda:m \ pnmimage:c pnmimagetypes:c panda:m pandaexpress:m \
dtool:m dtoolconfig:m \
pystub pystub
#define SOURCES \ #define SOURCES \
@ -25,8 +26,9 @@
#define TARGET font-samples #define TARGET font-samples
#define OTHER_LIBS \ #define OTHER_LIBS \
progbase \ progbase pandatoolbase \
pnmimage:c pnmimagetypes:c panda:m \ pnmimage:c pnmimagetypes:c panda:m pandaexpress:m \
dtool:m dtoolconfig:m \
pystub pystub
#define SOURCES \ #define SOURCES \

2
pandaapp/src/indexify/default_font.cxx
View File

@ -26,7 +26,7 @@
// This is used as a standard fallback font when no font file is // This is used as a standard fallback font when no font file is
// specified by the user. // specified by the user.
const char default_font[] = { const unsigned char default_font[] = {
0x80, 0x01, 0x6e, 0x06, 0x00, 0x00, 0x25, 0x21, 0x50, 0x53, 0x2d, 0x80, 0x01, 0x6e, 0x06, 0x00, 0x00, 0x25, 0x21, 0x50, 0x53, 0x2d,
0x41, 0x64, 0x6f, 0x62, 0x65, 0x46, 0x6f, 0x6e, 0x74, 0x2d, 0x31, 0x41, 0x64, 0x6f, 0x62, 0x65, 0x46, 0x6f, 0x6e, 0x74, 0x2d, 0x31,
0x2e, 0x30, 0x3a, 0x20, 0x4e, 0x69, 0x6d, 0x62, 0x75, 0x73, 0x53, 0x2e, 0x30, 0x3a, 0x20, 0x4e, 0x69, 0x6d, 0x62, 0x75, 0x73, 0x53,

2
pandaapp/src/indexify/default_font.h
View File

@ -19,7 +19,7 @@
#ifndef DEFAULT_FONT_H #ifndef DEFAULT_FONT_H
#define DEFAULT_FONT_H #define DEFAULT_FONT_H
extern const char default_font[]; extern const unsigned char default_font[];
extern const int default_font_size; extern const int default_font_size;
#endif #endif

6
pandaapp/src/indexify/default_index_icons.cxx
View File

@ -23,7 +23,7 @@
// supplied on the command line. // supplied on the command line.
const char *default_left_icon_filename = "left.png"; const char *default_left_icon_filename = "left.png";
const char default_left_icon[] = { const unsigned char default_left_icon[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00,
0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
0x00, 0x1e, 0x08, 0x03, 0x00, 0x00, 0x00, 0x0c, 0xee, 0x5e, 0x90, 0x00, 0x1e, 0x08, 0x03, 0x00, 0x00, 0x00, 0x0c, 0xee, 0x5e, 0x90,
@ -77,7 +77,7 @@ const char default_left_icon[] = {
const int default_left_icon_size = sizeof(default_left_icon); const int default_left_icon_size = sizeof(default_left_icon);
const char *default_right_icon_filename = "right.png"; const char *default_right_icon_filename = "right.png";
const char default_right_icon[] = { const unsigned char default_right_icon[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00,
0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
0x00, 0x1e, 0x08, 0x03, 0x00, 0x00, 0x00, 0x0c, 0xee, 0x5e, 0x90, 0x00, 0x1e, 0x08, 0x03, 0x00, 0x00, 0x00, 0x0c, 0xee, 0x5e, 0x90,
@ -130,7 +130,7 @@ const char default_right_icon[] = {
const int default_right_icon_size = sizeof(default_right_icon); const int default_right_icon_size = sizeof(default_right_icon);
const char *default_up_icon_filename = "up.png"; const char *default_up_icon_filename = "up.png";
const char default_up_icon[] = { const unsigned char default_up_icon[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00,
0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00,
0x00, 0x1e, 0x08, 0x03, 0x00, 0x00, 0x00, 0x0c, 0xee, 0x5e, 0x90, 0x00, 0x1e, 0x08, 0x03, 0x00, 0x00, 0x00, 0x0c, 0xee, 0x5e, 0x90,

6
pandaapp/src/indexify/default_index_icons.h
View File

@ -20,15 +20,15 @@
#define DEFAULT_INDEX_ICONS_H #define DEFAULT_INDEX_ICONS_H
extern const char *default_left_icon_filename; extern const char *default_left_icon_filename;
extern const char default_left_icon[]; extern const unsigned char default_left_icon[];
extern const int default_left_icon_size; extern const int default_left_icon_size;
extern const char *default_right_icon_filename; extern const char *default_right_icon_filename;
extern const char default_right_icon[]; extern const unsigned char default_right_icon[];
extern const int default_right_icon_size; extern const int default_right_icon_size;
extern const char *default_up_icon_filename; extern const char *default_up_icon_filename;
extern const char default_up_icon[]; extern const unsigned char default_up_icon[];
extern const int default_up_icon_size; extern const int default_up_icon_size;
#endif #endif

7
pandaapp/src/indexify/fontSamples.cxx
View File

@ -24,6 +24,10 @@
#include <stdio.h> #include <stdio.h>
#ifdef WIN32_VC
#define snprintf _snprintf
#endif
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: FontSamples::Constructor // Function: FontSamples::Constructor
// Access: Public // Access: Public
@ -166,7 +170,8 @@ post_command_line() {
} }
if (_name_text_maker == (PNMTextMaker *)NULL) { if (_name_text_maker == (PNMTextMaker *)NULL) {
_name_text_maker = new PNMTextMaker(default_font, default_font_size, 0); _name_text_maker = new PNMTextMaker((const char *)default_font,
default_font_size, 0);
if (!_name_text_maker->is_valid()) { if (!_name_text_maker->is_valid()) {
nout << "Unable to open default font.\n"; nout << "Unable to open default font.\n";
delete _name_text_maker; delete _name_text_maker;

9
pandaapp/src/indexify/indexify.cxx
View File

@ -376,7 +376,8 @@ post_command_line() {
} }
if (_text_maker == (PNMTextMaker *)NULL) { if (_text_maker == (PNMTextMaker *)NULL) {
_text_maker = new PNMTextMaker(default_font, default_font_size, 0); _text_maker = new PNMTextMaker((const char *)default_font,
default_font_size, 0);
if (!_text_maker->is_valid()) { if (!_text_maker->is_valid()) {
nout << "Unable to open default font.\n"; nout << "Unable to open default font.\n";
delete _text_maker; delete _text_maker;
@ -405,7 +406,7 @@ post_command_line() {
nout << "Unable to write to " << icon_filename << "\n"; nout << "Unable to write to " << icon_filename << "\n";
exit(1); exit(1);
} }
output.write(default_left_icon, default_left_icon_size); output.write((const char *)default_left_icon, default_left_icon_size);
} }
} }
if (next_icon.empty()) { if (next_icon.empty()) {
@ -421,7 +422,7 @@ post_command_line() {
nout << "Unable to write to " << icon_filename << "\n"; nout << "Unable to write to " << icon_filename << "\n";
exit(1); exit(1);
} }
output.write(default_right_icon, default_right_icon_size); output.write((const char *)default_right_icon, default_right_icon_size);
} }
} }
if (up_icon.empty()) { if (up_icon.empty()) {
@ -437,7 +438,7 @@ post_command_line() {
nout << "Unable to write to " << icon_filename << "\n"; nout << "Unable to write to " << icon_filename << "\n";
exit(1); exit(1);
} }
output.write(default_up_icon, default_up_icon_size); output.write((const char *)default_up_icon, default_up_icon_size);
} }
} }
} }

4
pandaapp/src/stitch/Sources.pp
View File

@ -3,7 +3,7 @@
#define LOCAL_LIBS \ #define LOCAL_LIBS \
stitchbase stitchbase
#define OTHER_LIBS \ #define OTHER_LIBS \
progbase converter \ progbase pandatoolbase converter \
pnmimage:c mathutil:c linmath:c putil:c panda:m \ pnmimage:c mathutil:c linmath:c putil:c panda:m \
express:c pandabase:c pandaexpress:m \ express:c pandabase:c pandaexpress:m \
dtoolutil:c dconfig:c dtoolbase:c dtoolconfig:m dtool:m \ dtoolutil:c dconfig:c dtoolbase:c dtoolconfig:m dtool:m \
@ -21,7 +21,7 @@
#define LOCAL_LIBS \ #define LOCAL_LIBS \
stitchbase stitchbase
#define OTHER_LIBS \ #define OTHER_LIBS \
progbase converter \ progbase pandatoolbase converter \
pnmimagetypes:c pnmimage:c linmath:c putil:c panda:m \ pnmimagetypes:c pnmimage:c linmath:c putil:c panda:m \
express:c pandabase:c pandaexpress:m \ express:c pandabase:c pandaexpress:m \
dtoolutil:c dconfig:c dtoolbase:c dtoolconfig:m dtool:m \ dtoolutil:c dconfig:c dtoolbase:c dtoolconfig:m dtool:m \

2
pandaapp/src/stitchbase/layeredImage.cxx
View File

@ -728,7 +728,7 @@ xcf_save_tile(const LayeredImage::TileManager &tm, int level, int tile) {
array[i++] = tm._data->get_red_val(x, y); array[i++] = tm._data->get_red_val(x, y);
array[i++] = tm._data->get_green_val(x, y); array[i++] = tm._data->get_green_val(x, y);
array[i++] = tm._data->get_blue_val(x, y); array[i++] = tm._data->get_blue_val(x, y);
array[i++] = 255; array[i++] = -1;
} }
} }
assert(i == size); assert(i == size);

3
pandaapp/src/stitchbase/stitchParser.yxx
View File

@ -91,6 +91,7 @@ stitch_init_parser(istream &in, const string &filename,
stitch_file: stitch_file:
commands commands
;
commands: commands:
empty empty
@ -333,7 +334,7 @@ points_list:
length: length:
NUMBER length_units NUMBER length_units
{ {
$$ = $1 * $2 $$ = $1 * $2;
} }
| NUMBER_FEET | NUMBER_FEET
{ {