Skip to content

Commit cbfa38d

Browse files
drwrosedrwrose
committed
simplify ConfigureDecl etc.
1 parent d2aa0ec commit cbfa38d

27 files changed

+79
-751
lines changed

‎direct/src/dcparse/Sources.pp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
prc:c pstatclient:c pandabase:c linmath:c putil:c \
88
pipeline:c \
99
$[if $[HAVE_NET],net:c] $[if $[WANT_NATIVE_NET],nativenet:c] \
10+
panda:m \
1011
pystub
1112

1213
#define C++FLAGS -DWITHIN_PANDA
@@ -17,5 +18,6 @@
1718

1819
#define SOURCES \
1920
dcparse.cxx
21+
#define WIN_SYS_LIBS shell32.lib
2022
#end bin_target
2123

‎direct/src/directbase/directsymbols.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
/* See dtoolsymbols.h for a rant on the purpose of this file. */
1919

20-
#if defined(WIN32_VC) && !defined(CPPPARSER)
20+
#if defined(WIN32_VC) && !defined(CPPPARSER) && !defined(LINK_ALL_STATIC)
2121

2222
#ifdef BUILDING_DIRECT
2323
#define EXPCL_DIRECT __declspec(dllexport)

‎direct/src/plugin/Sources.pp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// This directory is still experimental. Define HAVE_P3D_PLUGIN in
22
// your Config.pp to build it.
3-
#define BUILD_DIRECTORY $[and $[HAVE_P3D_PLUGIN],$[HAVE_TINYXML],$[HAVE_OPENSSL],$[HAVE_ZLIB],$[HAVE_TAR]]
3+
#define BUILD_DIRECTORY $[and $[HAVE_P3D_PLUGIN],$[HAVE_TINYXML],$[HAVE_OPENSSL],$[HAVE_ZLIB]]
44

55
#begin lib_target
6-
#define USE_PACKAGES tinyxml openssl zlib tar
6+
#define USE_PACKAGES tinyxml openssl zlib
77
#define TARGET p3d_plugin
88

99
#define COMBINED_SOURCES \
@@ -58,7 +58,7 @@
5858
#end bin_target
5959

6060
#begin bin_target
61-
#define USE_PACKAGES openssl zlib tar
61+
#define USE_PACKAGES openssl zlib
6262
#define TARGET panda3d
6363

6464
#define OTHER_LIBS \

‎direct/src/showbase/showBase.N‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
forcetype ConfigShowbase

‎direct/src/showbase/showBase.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ throw_new_frame() {
4949

5050
// Returns the configure object for accessing config variables from a
5151
// scripting language.
52-
ConfigShowbase &
52+
DConfig &
5353
get_config_showbase() {
54+
static DConfig config_showbase;
5455
return config_showbase;
5556
}
5657

‎direct/src/showbase/showBase.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "nodePath.h"
2929

3030
ConfigureDecl(config_showbase, EXPCL_DIRECT, EXPTP_DIRECT);
31-
typedef Config::Config<ConfigureGetConfig_config_showbase> ConfigShowbase;
3231

3332
class CollisionTraverser;
3433
class Camera;
@@ -40,7 +39,7 @@ EXPCL_DIRECT ConfigVariableSearchPath &get_particle_path();
4039

4140
EXPCL_DIRECT void throw_new_frame();
4241

43-
EXPCL_DIRECT ConfigShowbase &get_config_showbase();
42+
EXPCL_DIRECT DConfig &get_config_showbase();
4443

4544

4645
// klunky interface since we cant pass array from python->C++

‎dtool/src/dconfig/Sources.pp‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,15 @@
66
#define COMBINED_SOURCES $[TARGET]_composite1.cxx
77

88
#define SOURCES \
9-
configTable.I configTable.h \
10-
config_dconfig.h config_setup.h \
11-
dconfig.I dconfig.h \
12-
serialization.I serialization.h \
13-
symbolEnt.I symbolEnt.h
9+
config_dconfig.h \
10+
dconfig.I dconfig.h
1411

1512
#define INCLUDED_SOURCES \
16-
configTable.cxx config_dconfig.cxx dconfig.cxx \
17-
symbolEnt.cxx
13+
config_dconfig.cxx dconfig.cxx
1814

19-
#define INSTALL_HEADERS \
20-
configTable.I configTable.h config_dconfig.h config_setup.h \
21-
dconfig.I dconfig.h \
22-
serialization.I serialization.h \
23-
symbolEnt.I symbolEnt.h
15+
#define INSTALL_HEADERS \
16+
config_dconfig.h \
17+
dconfig.I dconfig.h
2418

2519
#end lib_target
2620

‎dtool/src/dconfig/configTable.I‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎dtool/src/dconfig/configTable.cxx‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎dtool/src/dconfig/configTable.h‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)