Skip to content
This repository has been archived by the owner on Apr 2, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	source/lib/RakNet/RakNet.cbp
	source/lib/RakNet/makefile
	source/lib/amx/amx.cbp
	source/lib/amx/makefile.windows
	source/lib/iniparser
	source/lib/packet
	source/vaultmp.cpp
	source/vaultserver/makefile.windows
  • Loading branch information
Koncord committed Jul 22, 2014
2 parents 72a97df + 2a0c734 commit b90427a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion source/vaultmaster/makefile.windows
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AR = ar
LD = g++
WINDRES = windres

INC = -I.. -I..\\lib
INC = -I.. -I..\\lib
CFLAGS = -m32 -std=gnu++0x
RESINC =
LIBDIR =
Expand Down
2 changes: 1 addition & 1 deletion source/vaultserver/makefile.windows
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ AR = ar.exe
LD = g++.exe
WINDRES = windres.exe

INC = -I.. -IF:\SDK\boost_1_55_0 -I..\\lib
INC = -I.. -I..\\lib
CFLAGS = -pedantic-errors -pedantic -Wfatal-errors -Wextra -Wall -std=gnu++1y -m32 -DVAULTSERVER
CFLAGSEXT = -DPACKAGE -DPACKAGE_VERSION
RESINC =
Expand Down

0 comments on commit b90427a

Please sign in to comment.