ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2024-11-22 12:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Makefile update and removed expat

Browse source 
- Updated all Makefiles
- Removed expat (might be replaced by libxml2)
This commit is contained in:
Walter Julius Hennecke 2012-05-05 16:34:57 +02:00
parent c8f750721c
commit 8bd25cb50b
9 changed files with 17 additions and 1095 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cgame/Makefile
View file

@ -116,10 +116,14 @@ LUAOBJ = \
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
DO_SOCC = $(CC) $(SOCFLAGS) -Wall -g3 $(DEFINES) -o $@ -c $< DO_SOCC = $(CC) $(SOCFLAGS) -Wall -g3 $(DEFINES) -o $@ -c $<
else else
DO_SOCC = $(CC) $(SOCFLAGS) -Wall $(DEFINES) -o $@ -c $< DO_SOCC = $(CC) $(SOCFLAGS) -Wall -Wno-unused-but-set-variable $(DEFINES) -o $@ -c $<
endif endif
# do cc for lua # do cc for lua
ifeq ($(DEBUF), 1)
DO_LUACC = $(CC) -O2 -Wall -g3 $(SOCFLAGS) -DLUA_COMPAT_ALL -o $@ -c $<
else
DO_LUACC = $(CC) -O2 -Wall $(SOCFLAGS) -DLUA_COMPAT_ALL -o $@ -c $< DO_LUACC = $(CC) -O2 -Wall $(SOCFLAGS) -DLUA_COMPAT_ALL -o $@ -c $<
endif
build_so: DO_CC=$(DO_SOCC) build_so: DO_CC=$(DO_SOCC)

1014
expat/expat.h
View file

File diff suppressed because it is too large Load diff

12
game/Makefile
View file

@ -19,17 +19,15 @@ endif
ifeq ($(PLATFORM), mingw32) ifeq ($(PLATFORM), mingw32)
EXT=dll EXT=dll
ARCH=x86 ARCH=x86
LIBEXPAT=../libs/win32/expat/libexpat.a
else else
EXT=so EXT=so
LIBEXPAT=../libs/linux/$(ARCH)/libexpat.a
endif endif
# warning level # warning level
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
WL=-Wall WL=-Wall
else else
WL=-Wall WL=-Wall -Wno-unused-but-set-variable
endif endif
#defines #defines
@ -147,7 +145,11 @@ else
DO_SOCC = $(CC) $(SOCFLAGS) $(WL) $(DEFINES) -o $@ -c $< DO_SOCC = $(CC) $(SOCFLAGS) $(WL) $(DEFINES) -o $@ -c $<
endif endif
# do cc for lua # do cc for lua
ifeq ($(DEBUG), 1)
DO_LUACC = $(CC) -O2 -Wall -g3 $(SOCFLAGS) -DLUA_COMPAT_ALL -o $@ -c $<
else
DO_LUACC = $(CC) -O2 -Wall $(SOCFLAGS) -DLUA_COMPAT_ALL -o $@ -c $< DO_LUACC = $(CC) -O2 -Wall $(SOCFLAGS) -DLUA_COMPAT_ALL -o $@ -c $<
endif
build_so: DO_CC=$(DO_SOCC) build_so: DO_CC=$(DO_SOCC)
@ -250,9 +252,9 @@ lzio.o: lzio.c; $(DO_LUACC)
build_so: $(OBJ) $(SOOBJ) $(LUAOBJ) build_so: $(OBJ) $(SOOBJ) $(LUAOBJ)
ifeq ($(PLATFORM), mingw32) ifeq ($(PLATFORM), mingw32)
$(CC) -shared $(WL),--export-all-symbols,-soname,qqgame$(ARCH).$(EXT) -o qagame$(ARCH).$(EXT) $(OBJ) $(SOOBJ) $(LUAOBJ) $(LIBEXPAT) -lm $(CC) -shared -Wl,--export-all-symbols,-soname,qqgame$(ARCH).$(EXT) -o qagame$(ARCH).$(EXT) $(OBJ) $(SOOBJ) $(LUAOBJ) -lm
else else
$(CC) -shared $(WL),--export-dynamic,-soname,qagame$(ARCH).$(EXT) -o qagame$(ARCH).$(EXT) $(OBJ) $(SOOBJ) $(LUAOBJ) $(LIBEXPAT) -lm $(CC) -shared -Wl,--export-dynamic,-soname,qagame$(ARCH).$(EXT) -o qagame$(ARCH).$(EXT) $(OBJ) $(SOOBJ) $(LUAOBJ) -lm
endif endif
clean: clean:

2
game/g_main.c
View file

@ -346,7 +346,6 @@ vmCvar_t sql_user; //!< SQL user for sql_server (only mysql)
vmCvar_t sql_password; //!< SQL password for sql_server (only mysql) vmCvar_t sql_password; //!< SQL password for sql_server (only mysql)
vmCvar_t sql_port; //!< SQL port to use to connect to sql_server (only mysql) vmCvar_t sql_port; //!< SQL port to use to connect to sql_server (only mysql)
vmCvar_t sql_hash; //!< Specifies whether passwords should be hashed and what hash to use (only mysql) vmCvar_t sql_hash; //!< Specifies whether passwords should be hashed and what hash to use (only mysql)
#endif
// developer tools // developer tools
vmCvar_t dev_showTriggers; vmCvar_t dev_showTriggers;
@ -622,7 +621,6 @@ static cvarTable_t gameCvarTable[] = {
{ &sql_server, "sql_server", "", CVAR_ARCHIVE, 0, qfalse }, { &sql_server, "sql_server", "", CVAR_ARCHIVE, 0, qfalse },
{ &sql_user, "sql_user", "rpgx", CVAR_ARCHIVE, 0, qfalse }, { &sql_user, "sql_user", "rpgx", CVAR_ARCHIVE, 0, qfalse },
{ &sql_hash, "sql_hash", "0", CVAR_ARCHIVE, 0, qfalse } { &sql_hash, "sql_hash", "0", CVAR_ARCHIVE, 0, qfalse }
#endif
#ifdef G_LUA #ifdef G_LUA
, ,

4
game/q_shared.h
View file

@ -59,7 +59,7 @@
#ifdef Q3_VM #ifdef Q3_VM
//#include "bg_lib.h" //#include "bg_lib.h"
#error "Q3_VM detected: QVMs are no longer supported by RPG-X2 #error "Q3_VM detected: QVMs are no longer supported by RPG-X2"
#else #else
#include <assert.h> #include <assert.h>
@ -83,7 +83,7 @@
// Needed for mods compiled in 64 bit shared objects. // Needed for mods compiled in 64 bit shared objects.
#ifdef Q3_VM #ifdef Q3_VM
// typedef int intptr_t; // typedef int intptr_t;
#error "Q3_VM detected: QVMs are no longer supported by RPG-X2 #error "Q3_VM detected: QVMs are no longer supported by RPG-X2"
#else #else
#ifdef _MSC_VER #ifdef _MSC_VER
#include <stddef.h> #include <stddef.h>

BIN
libs/win32/expat/libexpat.a
View file

Binary file not shown.

35
libs/win32/expat/libexpat.la
View file

@ -1,35 +0,0 @@
# libexpat.la - a libtool library file
# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
# The name that we can dlopen(3).
dlname='libexpat-1.dll'
# Names of this library.
library_names='libexpat.dll.a'
# The name of the static archive.
old_library='libexpat.a'
# Libraries that this one depends upon.
dependency_libs=''
# Version information for libexpat.
current=6
age=5
revision=2
# Is this an already installed library?
installed=no
# Should we warn about portability when linking against -modules?
shouldnotlink=no
# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''
# Directory that this library needs to be installed in:
libdir='/usr/local/lib'

35
libs/win32/expat/libexpat.lai
View file

@ -1,35 +0,0 @@
# libexpat.la - a libtool library file
# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
# The name that we can dlopen(3).
dlname='../bin/libexpat-1.dll'
# Names of this library.
library_names='libexpat.dll.a'
# The name of the static archive.
old_library='libexpat.a'
# Libraries that this one depends upon.
dependency_libs=''
# Version information for libexpat.
current=6
age=5
revision=2
# Is this an already installed library?
installed=yes
# Should we warn about portability when linking against -modules?
shouldnotlink=no
# Files to dlopen/dlpreopen
dlopen=''
dlpreopen=''
# Directory that this library needs to be installed in:
libdir='/usr/local/lib'

4
ui/Makefile
View file

@ -78,11 +78,13 @@ OBJDEP = \
SOOBJ = \ SOOBJ = \
ui_syscalls.o ui_syscalls.o
# do cc for shared libraries # do cc for shared libraries
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
DO_SOCC = $(CC) $(SOCFLAGS) -Wall -g3 $(DEFINES) -o $@ -c $< DO_SOCC = $(CC) $(SOCFLAGS) -Wall -g3 $(DEFINES) -o $@ -c $<
else else
DO_SOCC = $(CC) $(SOCFLAGS) -Wall $(DEFINES) -o $@ -c $< DO_SOCC = $(CC) $(SOCFLAGS) -Wall -Wno-unused-but-set-variable $(DEFINES) -o $@ -c $<
endif endif
build_so: DO_CC=$(DO_SOCC) build_so: DO_CC=$(DO_SOCC)