Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed building with newly updated SDK.

Browse Source 
Former-commit-id: bf0455aea7c54493b2b921a2fef52120163e0959
This commit is contained in:
Scott Ehlert
2013-09-05 19:51:52 -05:00
parent 2a458530b7
commit 568bec17fc
60 changed files with 243 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/sqlite/Makefile
View File

@ -5,7 +5,7 @@
### EDIT THESE PATHS FOR YOUR OWN SETUP ###
###########################################
HLSDK = ../../../hlsdk/multiplayer
HLSDK = ../../../hlsdk
MM_ROOT = ../../../metamod/metamod
SQL = sqlite-source
@ -42,7 +42,7 @@ CPP_OSX = clang
LINK =
INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/common -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared \
-I$(MM_ROOT) -I$(SQL) -Isqlitepp -Ithread -Isdk
-I$(HLSDK)/public -I$(MM_ROOT) -I$(SQL) -Isqlitepp -Ithread -Isdk
################################################
### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
@ -96,6 +96,11 @@ ifeq "$(shell expr $(IS_CLANG) \| $(CPP_MAJOR) \>= 4)" "1"
CPPFLAGS += $(CPP_GCC4_FLAGS)
endif
# GCC >= 4.6
ifeq "$(shell expr $(IS_CLANG) \= 0 \& \( \( $(CPP_MAJOR) \= 4 \& $(CPP_MINOR) \>= 6 \) \| $(CPP_MAJOR) \> 4 \))" "1"
CFLAGS += -Wno-unused-but-set-variable
endif
# Clang >= 3 || GCC >= 4.7
ifeq "$(shell expr $(IS_CLANG) \& $(CPP_MAJOR) \>= 3 \| $(CPP_MAJOR) \>= 4 \& $(CPP_MINOR) \>= 7)" "1"
CPPFLAGS += -Wno-delete-non-virtual-dtor