mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-29 16:20:11 -04:00
*** empty log message ***
This commit is contained in:
parent
78f97090a4
commit
c5b62abdb8
@ -46,55 +46,55 @@ endif
|
|||||||
|
|
||||||
ifeq (PS2, $(PENV))
|
ifeq (PS2, $(PENV))
|
||||||
AR = ee-ar
|
AR = ee-ar
|
||||||
LD = ee-ld
|
SET_LD = ee-ld
|
||||||
else
|
else
|
||||||
AR = ar
|
AR = ar
|
||||||
LD = ld
|
SET_LD = ld
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LDFLAGS =
|
SET_LDFLAGS =
|
||||||
LINKFLAGS =
|
LINKFLAGS =
|
||||||
|
|
||||||
# C files
|
# C files
|
||||||
ifneq (,$(CFILES))
|
ifneq (,$(CFILES))
|
||||||
LD := $(CC)
|
SET_LD := $(CC)
|
||||||
LDFLAGS := $(CLDFLAGS) $(CFLAGS)
|
SET_LDFLAGS := $(CLDFLAGS) $(CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# C++ files
|
# C++ files
|
||||||
ifneq (,$(C++FILES)) # If there are C++ files, make it CC
|
ifneq (,$(C++FILES)) # If there are C++ files, make it CC
|
||||||
LD := $(C++)
|
SET_LD := $(C++)
|
||||||
LDFLAGS := $(C++LDFLAGS) $(C++FLAGS)
|
SET_LDFLAGS := $(C++LDFLAGS) $(C++FLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# C files in the OFILES list
|
# C files in the OFILES list
|
||||||
ifneq (,$(findstring .c,$(suffix $(OFILES))))
|
ifneq (,$(findstring .c,$(suffix $(OFILES))))
|
||||||
LD := $(CC)
|
SET_LD := $(CC)
|
||||||
LDFLAGS := $(IPATH) $(CLDFLAGS) $(CFLAGS)
|
SET_LDFLAGS := $(IPATH) $(CLDFLAGS) $(CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# C++ files in the OFILES list
|
# C++ files in the OFILES list
|
||||||
ifneq (,$(findstring .cxx,$(suffix $(OFILES))))
|
ifneq (,$(findstring .cxx,$(suffix $(OFILES))))
|
||||||
LD := $(C++)
|
SET_LD := $(C++)
|
||||||
LDFLAGS := $(IPATH) $(C++LDFLAGS) $(C++FLAGS)
|
SET_LDFLAGS := $(IPATH) $(C++LDFLAGS) $(C++FLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Making a DSO - use C++ for now
|
# Making a DSO - use C++ for now
|
||||||
ifeq (.so,$(suffix $(TARGET)))
|
ifeq (.so,$(suffix $(TARGET)))
|
||||||
LD := $(C++)
|
SET_LD := $(C++)
|
||||||
LDFLAGS := $(IPATH) $(C++LDFLAGS) $(C++FLAGS)
|
SET_LDFLAGS := $(IPATH) $(C++LDFLAGS) $(C++FLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Making a DLL - use C++ for now
|
# Making a DLL - use C++ for now
|
||||||
ifeq (.dll,$(suffix $(TARGET)))
|
ifeq (.dll,$(suffix $(TARGET)))
|
||||||
LD := $(C++)
|
SET_LD := $(C++)
|
||||||
LDFLAGS := $(C++LDFLAGS) $(C++FLAGS)
|
SET_LDFLAGS := $(C++LDFLAGS) $(C++FLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Making a WIN binary file
|
# Making a WIN binary file
|
||||||
ifeq (WIN32,$(PENV))
|
ifeq (WIN32,$(PENV))
|
||||||
LD = link
|
SET_LD = link
|
||||||
LDFLAGS = -NOLOGO
|
SET_LDFLAGS = -NOLOGO
|
||||||
|
|
||||||
ifeq (4,$(OPTIMIZE))
|
ifeq (4,$(OPTIMIZE))
|
||||||
LINKFLAGS += -fixed:no
|
LINKFLAGS += -fixed:no
|
||||||
@ -107,6 +107,12 @@ ifeq (WIN32,$(PENV))
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
ifeq ($(LD),)
|
||||||
|
LD := $(SET_LD)
|
||||||
|
endif
|
||||||
|
LDFLAGS += $(SET_LDFLAGS)
|
||||||
|
|
||||||
ARFLAGS = ruv
|
ARFLAGS = ruv
|
||||||
|
|
||||||
|
|
||||||
|
@ -3,7 +3,9 @@
|
|||||||
#define LOCAL_LIBS \
|
#define LOCAL_LIBS \
|
||||||
eggbase progbase
|
eggbase progbase
|
||||||
#define OTHER_LIBS \
|
#define OTHER_LIBS \
|
||||||
egg:c linmath:c putil:c express:c panda:m dtool
|
egg:c linmath:c putil:c express:c panda:m \
|
||||||
|
dtoolutil:c dconfig:c dtool:m
|
||||||
|
|
||||||
#define UNIX_SYS_LIBS \
|
#define UNIX_SYS_LIBS \
|
||||||
m
|
m
|
||||||
|
|
||||||
|
@ -6,7 +6,8 @@
|
|||||||
#define LOCAL_LIBS \
|
#define LOCAL_LIBS \
|
||||||
gtkbase progbase pstatserver
|
gtkbase progbase pstatserver
|
||||||
#define OTHER_LIBS \
|
#define OTHER_LIBS \
|
||||||
pstatclient:c linmath:c putil:c express:c panda:m dtool
|
pstatclient:c linmath:c putil:c express:c panda:m \
|
||||||
|
dtoolutil:c dconfig:c dtool:m
|
||||||
#define UNIX_SYS_LIBS \
|
#define UNIX_SYS_LIBS \
|
||||||
m
|
m
|
||||||
|
|
||||||
|
@ -14,7 +14,8 @@
|
|||||||
#define LOCAL_LIBS \
|
#define LOCAL_LIBS \
|
||||||
eggbase progbase
|
eggbase progbase
|
||||||
#define OTHER_LIBS \
|
#define OTHER_LIBS \
|
||||||
egg:c linmath:c putil:c express:c panda:m dtool
|
egg:c linmath:c putil:c express:c panda:m \
|
||||||
|
dtoolutil:c dconfig:c dtool:m
|
||||||
#define UNIX_SYS_LIBS \
|
#define UNIX_SYS_LIBS \
|
||||||
m
|
m
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user