Skip to content
Snippets Groups Projects
Commit e77ab461 authored by deuce's avatar deuce
Browse files

Remove xpdev dependency

Remove all kinds of globals
Clean up a number of bugs
Convert most doubles to integer types (Using long longs in a number of
places)
There *may* still be an issue with player battles... not sure.
parent ade83d98
No related branches found
No related tags found
No related merge requests found
...@@ -5,9 +5,6 @@ include ${SRC_ROOT}/build/Common.gmake ...@@ -5,9 +5,6 @@ include ${SRC_ROOT}/build/Common.gmake
LDFLAGS += -L../../odoors LDFLAGS += -L../../odoors
CFLAGS += -I../../odoors CFLAGS += -I../../odoors
CFLAGS += $(XPDEV_CFLAGS)
LDFLAGS += $(XPDEV-MT_LDFLAGS)
ifdef STATIC ifdef STATIC
LDFLAGS += -static LDFLAGS += -static
endif endif
...@@ -19,7 +16,7 @@ export LD_RUN_PATH ...@@ -19,7 +16,7 @@ export LD_RUN_PATH
$(DGNLNCE): $(OBJS) $(DGNLNCE): $(OBJS)
@echo Linking $@ @echo Linking $@
${QUIET}$(CC) $(LDFLAGS) -o $@ $(OBJS) $(XPDEV_LIBS) -lODoors ${QUIET}$(CC) $(LDFLAGS) -o $@ $(OBJS) -lODoors
$(ODOORS_LIB): $(ODOORS_LIB):
@echo Building $@ @echo Building $@
......
This diff is collapsed.
...@@ -5,6 +5,6 @@ else ...@@ -5,6 +5,6 @@ else
ODOORS_LIB = $(SRC_ROOT)$(DIRSEP)odoors$(DIRSEP)$(LIBPREFIX)ODoors$(SOFILE) ODOORS_LIB = $(SRC_ROOT)$(DIRSEP)odoors$(DIRSEP)$(LIBPREFIX)ODoors$(SOFILE)
endif endif
all: xpdev $(OBJODIR) $(EXEODIR) $(DGNLNCE) all: $(OBJODIR) $(EXEODIR) $(DGNLNCE)
$(DGNLNCE): $(XPDEV_LIB) $(ODOORS_LIB) $(DGNLNCE): $(ODOORS_LIB)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment