Merge pull request #38 from katursis/dev

3.3.6
katursis · Sep 26, 2021 · 2d13396 · 2d13396
2 parents 89b6361 + 5541d91
commit 2d13396
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "lib/samp-ptl"]
 	path = lib/samp-ptl
 	url = https://github.com/katursis/samp-ptl
+[submodule "cmake/modules"]
+	path = cmake/modules
+	url = https://github.com/katursis/samp-cmake-modules
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,17 +2,14 @@ cmake_minimum_required(VERSION 3.10)
 
 project(pawncmd)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 
-if(MSVC)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-  add_definitions(-DHAVE_STDINT_H)
-endif()
+include(AddSAMPPlugin)
 
-include_directories(lib)
+add_samp_plugin(${PROJECT_NAME}
+  plugin.def
 
-add_library(${PROJECT_NAME} MODULE
+  src/Pawn.CMD.inc
   src/main.h
   src/main.cc
   src/plugin.h
@@ -21,14 +18,8 @@ add_library(${PROJECT_NAME} MODULE
   src/script.h
   src/script.cc
   src/command.h
-  src/Pawn.CMD.inc
-  plugin.def
-)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+  lib/samp-ptl/ptl.h
+)
 
-if(CMAKE_COMPILER_IS_GNUCC)
-  set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE Off)
-  set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS "-m32 -O3 -w")
-  set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS "-m32 -O3 -static-libgcc -static-libstdc++")
-endif()
+target_include_directories(${PROJECT_NAME} PRIVATE lib)
diff --git a/cmake/modules b/cmake/modules
diff --git a/lib/samp-ptl b/lib/samp-ptl
diff --git a/src/Pawn.CMD.inc b/src/Pawn.CMD.inc
@@ -29,7 +29,7 @@
         #define PACK_PLUGIN_VERSION(%0,%1,%2) (((%0) << 16) | ((%1) << 8) | (%2))
     #endif
 
-    #define PAWNCMD_VERSION PACK_PLUGIN_VERSION(3, 3, 5)
+    #define PAWNCMD_VERSION PACK_PLUGIN_VERSION(3, 3, 6)
     #define PAWNCMD_INCLUDE_VERSION PAWNCMD_VERSION // backward compatibility
 
     #if !defined __cplusplus

diff --git a/src/main.h b/src/main.h
@@ -25,8 +25,6 @@
 #ifndef PAWNCMD_MAIN_H_
 #define PAWNCMD_MAIN_H_
 
-#define _GLIBCXX_USE_CXX11_ABI 0 // For compatibility with samp03svr that was compiled with an older (< 5.1) version of GCC
-
 #include <queue>
 #include <regex>
 #include <string>

diff --git a/src/script.cc b/src/script.cc
@@ -145,7 +145,7 @@ bool Script::OnLoad() {
 
   auto &plugin = Plugin::Instance();
 
-  for (std::size_t index{}; index < num_publics; index++) {
+  for (int index{}; index < num_publics; index++) {
     std::string public_name = GetPublicName(index);
     std::smatch match;
     if (std::regex_match(public_name, match, regex_public_cmd_name_)) {