Skip to content

Commit e45fe32

Browse files
committed
lots of little changes for os x
1 parent 9693d44 commit e45fe32

File tree

5 files changed

+28
-10
lines changed

5 files changed

+28
-10
lines changed

direct/metalibs/direct/Sources.pp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88
#define BUILDING_DLL BUILDING_DIRECT
99

1010
#define COMPONENT_LIBS \
11-
directbase dcparser showbase deadrec directd interval
11+
directbase dcparser showbase deadrec directd interval
1212

13-
#define OTHER_LIBS panda pandaexpress dtoolconfig dtool
13+
#define OTHER_LIBS \
14+
panda:m \
15+
pandaexpress:m \
16+
interrogatedb:c dconfig:c dtoolconfig:m \
17+
dtoolutil:c dtoolbase:c dtool:m
1418

1519
#begin metalib_target
1620
#define TARGET direct

direct/src/dcparse/Sources.pp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
2-
dtoolutil:c dtoolbase:c dtool:m
31
#define LOCAL_LIBS \
4-
dcparser
2+
dcparser
3+
#define OTHER_LIBS \
4+
express:c \
5+
interrogatedb:c dconfig:c dtoolconfig:m \
6+
dtoolutil:c dtoolbase:c dtool:m
57
#define C++FLAGS -DWITHIN_PANDA
68

79
#begin bin_target

direct/src/deadrec/Sources.pp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
#begin lib_target
22
#define TARGET deadrec
3+
#define LOCAL_LIBS \
4+
directbase
5+
#define OTHER_LIBS \
6+
express:c linmath:c \
7+
interrogatedb:c dconfig:c \
8+
dtoolutil:c dtoolbase:c dtool:m
39

410
#define COMBINED_SOURCES $[TARGET]_composite1.cxx
511

@@ -14,7 +20,4 @@
1420

1521
#define IGATESCAN \
1622
all
17-
18-
#define LOCAL_LIBS \
19-
directbase
2023
#end lib_target

direct/src/interval/Sources.pp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
#define LOCAL_LIBS \
44
directbase
55
#define OTHER_LIBS \
6-
pgraph:c putil:c panda:m express:c pandaexpress:m dtoolconfig dtool
6+
downloader:c linmath:c lerp:c \
7+
chan:c event:c gobj:c pnmimage:c mathutil:c \
8+
pgraph:c putil:c panda:m express:c pandaexpress:m \
9+
interrogatedb:c dconfig:c dtoolconfig:m \
10+
dtoolutil:c dtoolbase:c dtool:m
711

812
#define SOURCES \
913
config_interval.cxx config_interval.h \

direct/src/showbase/Sources.pp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@
33
#define LOCAL_LIBS \
44
directbase
55
#define OTHER_LIBS \
6-
linmath:c putil:c panda:m express:c pandaexpress:m dtoolconfig dtool
6+
linmath:c \
7+
event:c \
8+
putil:c panda:m \
9+
express:c pandaexpress:m \
10+
interrogatedb:c dconfig:c dtoolconfig:m \
11+
dtoolutil:c dtoolbase:c dtool:m
712

813
#define SOURCES \
914
showBase.cxx showBase.h mersenne.cxx mersenne.h

0 commit comments

Comments
 (0)