mirror of
https://github.com/UberGames/RPG-X2.git
synced 2024-11-21 12:01:12 +00:00
Synch with rpgxEF Edition (Updated Makefiles)
- Added warning level var $WL - Added missing linking against pthread on linux
This commit is contained in:
parent
c2cca2738c
commit
720d92fd0d
3 changed files with 21 additions and 7 deletions
|
@ -23,6 +23,13 @@ else
|
|||
EXT=so
|
||||
endif
|
||||
|
||||
# warning level
|
||||
ifeq ($(DEBUG), 1)
|
||||
WL=-Wall
|
||||
else
|
||||
WL=-Wall -Wno-unused-but-set-variable
|
||||
endif
|
||||
|
||||
# cgame objects
|
||||
OBJ = \
|
||||
fx_transporter.o \
|
||||
|
@ -114,9 +121,9 @@ LUAOBJ = \
|
|||
|
||||
# do cc for shared library
|
||||
ifeq ($(DEBUG), 1)
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) -Wall -g3 $(DEFINES) -o $@ -c $<
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) $(WL) -g3 $(DEFINES) -o $@ -c $<
|
||||
else
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) -Wall -Wno-unused-but-set-variable $(DEFINES) -o $@ -c $<
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) $(WL) $(DEFINES) -o $@ -c $<
|
||||
endif
|
||||
# do cc for lua
|
||||
ifeq ($(DEBUG), 1)
|
||||
|
@ -215,9 +222,9 @@ lzio.o: ../game/lzio.c; $(DO_LUACC)
|
|||
|
||||
build_so: $(OBJDEP) $(OBJ) $(SOOBJ) $(LUAOBJ)
|
||||
ifeq ($(PLATFORM), mingw32)
|
||||
$(CC) -shared -Wl,--export-all-symbols,-soname,cgame$(ARCH).$(EXT) -o cgame$(ARCH).$(EXT) $(OBJ) $(OBJDEP) $(SOOBJ) $(LUAOBJ)
|
||||
$(CC) -shared -Wl,--export-all-symbols,-soname,cgame$(ARCH).$(EXT) -o cgame$(ARCH).$(EXT) $(OBJ) $(OBJDEP) $(SOOBJ) $(LUAOBJ) -lm
|
||||
else
|
||||
$(CC) -shared -Wl,--export-dynamic,-soname,cgame$(ARCH).$(EXT) -o cgame$(ARCH).$(EXT) $(OBJ) $(OBJDEP) $(SOOBJ) $(LUAOBJ)
|
||||
$(CC) -shared -Wl,--export-dynamic,-soname,cgame$(ARCH).$(EXT) -o cgame$(ARCH).$(EXT) $(OBJ) $(OBJDEP) $(SOOBJ) $(LUAOBJ) -lm -lpthread
|
||||
endif
|
||||
|
||||
clean:
|
||||
|
|
|
@ -254,7 +254,7 @@ build_so: $(OBJ) $(SOOBJ) $(LUAOBJ)
|
|||
ifeq ($(PLATFORM), mingw32)
|
||||
$(CC) -shared -Wl,--export-all-symbols,-soname,qqgame$(ARCH).$(EXT) -o qagame$(ARCH).$(EXT) $(OBJ) $(SOOBJ) $(LUAOBJ) -lm
|
||||
else
|
||||
$(CC) -shared -Wl,--export-dynamic,-soname,qagame$(ARCH).$(EXT) -o qagame$(ARCH).$(EXT) $(OBJ) $(SOOBJ) $(LUAOBJ) -lm
|
||||
$(CC) -shared -Wl,--export-dynamic,-soname,qagame$(ARCH).$(EXT) -o qagame$(ARCH).$(EXT) $(OBJ) $(SOOBJ) $(LUAOBJ) -lm -lpthread
|
||||
endif
|
||||
|
||||
clean:
|
||||
|
|
11
ui/Makefile
11
ui/Makefile
|
@ -25,6 +25,13 @@ else
|
|||
EXT=so
|
||||
endif
|
||||
|
||||
# warning level
|
||||
ifeq ($(DEBUG), 1)
|
||||
WL=-Wall
|
||||
else
|
||||
WL=-Wall -Wno-unused-but-set-variable
|
||||
endif
|
||||
|
||||
# ui objects
|
||||
OBJ = \
|
||||
ui_turbolift.o \
|
||||
|
@ -80,9 +87,9 @@ SOOBJ = \
|
|||
|
||||
# do cc for shared libraries
|
||||
ifeq ($(DEBUG), 1)
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) -Wall -g3 $(DEFINES) -o $@ -c $<
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) $(WL) -g3 $(DEFINES) -o $@ -c $<
|
||||
else
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) -Wall -Wno-unused-but-set-variable $(DEFINES) -o $@ -c $<
|
||||
DO_SOCC = $(CC) $(SOCFLAGS) $(WL) $(DEFINES) -o $@ -c $<
|
||||
endif
|
||||
|
||||
build_so: DO_CC=$(DO_SOCC)
|
||||
|
|
Loading…
Reference in a new issue