Skip to content

Introduction JSON module #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Sep 30, 2017
Merged

Introduction JSON module #379

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b9503e2
Add JSON module
Amaroq7 Mar 7, 2017
a7ff593
Merge upstream changes
Amaroq7 Mar 30, 2017
1c2c133
Add json include to PackageScript
Amaroq7 Mar 30, 2017
162373e
Merge branch 'master' into json-module
Amaroq7 Sep 4, 2017
730349e
Merge upstream changes
Amaroq7 Sep 4, 2017
56d86c9
Fix documentation
Amaroq7 Sep 4, 2017
1acc7cc
Use AutoPtr in managing JSON handles
Amaroq7 Sep 4, 2017
cf895be
Merge upstream changes
Amaroq7 Sep 7, 2017
9e18f84
Merge upstream
Amaroq7 Sep 27, 2017
cffaaa0
Fix crash
Amaroq7 Sep 27, 2017
2a44a89
Add VS projects files and fix mixed tab/spaces
Arkshine Sep 27, 2017
6bcf642
Merge pull request #1 from Arkshine/json-module
Amaroq7 Sep 27, 2017
8b52647
Remove erroring on "json_free"
Amaroq7 Sep 27, 2017
ccf06a6
Add comments to "json.inc" file
Amaroq7 Sep 27, 2017
92c4ba1
Remove overloaded operators
Amaroq7 Sep 30, 2017
c4f8723
Use of "override" keyword where needed
Amaroq7 Sep 30, 2017
0406a24
Fix parameter's name
Amaroq7 Sep 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AMBuildScript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ builder.RunBuildScripts(
'modules/fun/AMBuilder',
'modules/geoip/AMBuilder',
'modules/hamsandwich/AMBuilder',
'modules/json/AMBuilder',
'modules/mysqlx/AMBuilder',
'modules/ns/AMBuilder',
'modules/nvault/AMBuilder',
Expand Down
22 changes: 20 additions & 2 deletions amxmodx/msvc12/amxmodx_mm.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcxproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
EndProject
Expand Down Expand Up @@ -51,6 +51,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxxpc", "..\..\compiler\am
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpc300", "..\..\compiler\libpc300\libpc300.vcxproj", "{19B72687-080B-437A-917A-12AEB0031635}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json", "..\..\modules\json\msvc12\json.vcxproj", "{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -326,6 +328,18 @@ Global
{19B72687-080B-437A-917A-12AEB0031635}.JITReleaseBinLog|Win32.Build.0 = Release|Win32
{19B72687-080B-437A-917A-12AEB0031635}.Release|Win32.ActiveCfg = Release|Win32
{19B72687-080B-437A-917A-12AEB0031635}.Release|Win32.Build.0 = Release|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.Debug|Win32.ActiveCfg = Debug|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.Debug|Win32.Build.0 = Debug|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.JITDebug|Win32.ActiveCfg = Debug|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.JITDebug|Win32.Build.0 = Debug|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.JITDebugBinLog|Win32.ActiveCfg = Debug|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.JITDebugBinLog|Win32.Build.0 = Debug|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.JITRelease|Win32.ActiveCfg = Release|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.JITRelease|Win32.Build.0 = Release|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.JITReleaseBinLog|Win32.ActiveCfg = Release|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.JITReleaseBinLog|Win32.Build.0 = Release|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.Release|Win32.ActiveCfg = Release|Win32
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -352,5 +366,9 @@ Global
{7F18E00C-6271-4CAB-B18A-746BE3EC68E7} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226}
{39412290-D01C-472F-A439-AB5592A04C08} = {0BB61E37-4EA5-4B18-A164-6CB4810E50F4}
{19B72687-080B-437A-917A-12AEB0031635} = {0BB61E37-4EA5-4B18-A164-6CB4810E50F4}
{4CF9D220-F318-4D1C-81DF-E2377A2D8FFE} = {1A75873D-E05D-4F07-A4E2-28DC1BB03226}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E7D29DAA-4E6E-43AA-A2FC-7BD7758ABFD9}
EndGlobalSection
EndGlobal
24 changes: 24 additions & 0 deletions modules/json/AMBuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
import os.path

binary = AMXX.MetaModule(builder, 'json')

binary.compiler.defines += [
'HAVE_STDINT_H',
]

binary.compiler.cxxincludes += [
os.path.join(builder.currentSourcePath, '..', '..', 'third_party', 'parson')
]

binary.sources = [
'../../public/sdk/amxxmodule.cpp',
'../../third_party/parson/parson.c',
'JsonMngr.cpp',
'JsonNatives.cpp',
]

if builder.target_platform == 'windows':
binary.sources += ['version.rc']

AMXX.modules += [builder.Add(binary)]
Loading