Skip to content

Commit 88eba4b

Browse files
committed
fix: Tons of changes for linux compiling
1 parent f7698da commit 88eba4b

File tree

14 files changed

+1810
-1505
lines changed

14 files changed

+1810
-1505
lines changed

src/CMakeLists.txt

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,60 @@
1-
project(PySAMP)
2-
3-
add_compile_options(-std=c++11)
4-
5-
6-
cmake_minimum_required(VERSION 2.8)
7-
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
8-
9-
find_package ( PythonInterp 3.4.2)
10-
find_package ( PythonLibs 3.4.2)
11-
12-
include(AMXConfig)
13-
include(AddSAMPPlugin)
14-
15-
include_directories(
16-
${CMAKE_CURRENT_SOURCE_DIR}
17-
${CMAKE_CURRENT_SOURCE_DIR}/amx
18-
${CMAKE_CURRENT_SOURCE_DIR}/bindings
19-
${CMAKE_CURRENT_SOURCE_DIR}/pysamp
20-
${PYTHON_INCLUDE_DIR}
21-
)
22-
23-
add_definitions(-DSAMPGDK_AMALGAMATION)
24-
25-
link_libraries(${PYTHON_LIBRARIES})
26-
27-
add_samp_plugin(pySAMP
28-
amxplugin.cpp
29-
main.h
30-
main.cpp
31-
main.def
32-
sampgdk.c
33-
sampgdk.h
34-
pysamp/pysamp.cpp
35-
pysamp/pysamp.h
36-
pysamp/pygamemode.cpp
37-
pysamp/pygamemode.h
38-
bindings/callbacks.h
39-
bindings/samp.h
40-
bindings/const.h
41-
bindings/const.cpp
42-
test/callbackstest.h
43-
test/callbackstest.cpp
44-
)
45-
46-
find_package(Doxygen)
47-
if(DOXYGEN_FOUND)
48-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
49-
add_custom_target(doc
50-
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
51-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
52-
COMMENT "Generating API documentation with Doxygen" VERBATIM
53-
)
54-
endif(DOXYGEN_FOUND)
1+
project(PySAMP)
2+
3+
add_compile_options(-std=c++11)
4+
5+
6+
cmake_minimum_required(VERSION 2.8)
7+
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
8+
9+
#find_package (Python3 COMPONENTS Interpreter Development)
10+
11+
find_package (PythonInterp 3.5.3)
12+
find_package (PythonLibs 3.5.3)
13+
14+
include(AMXConfig)
15+
include(AddSAMPPlugin)
16+
17+
include_directories(
18+
${CMAKE_CURRENT_SOURCE_DIR}
19+
${CMAKE_CURRENT_SOURCE_DIR}/amx
20+
${CMAKE_CURRENT_SOURCE_DIR}/bindings
21+
${CMAKE_CURRENT_SOURCE_DIR}/pysamp
22+
${PYTHON_INCLUDE_DIR}
23+
)
24+
25+
message(STATUS "PYTHON_LIBRARY = ${PYTHON_LIBRARY}")
26+
message(STATUS "PYTHON_EXECUTABLE = ${PYTHON_EXECUTABLE}")
27+
message(STATUS "PYTHON_INCLUDE_DIR = ${PYTHON_INCLUDE_DIR}")
28+
29+
add_definitions(-DSAMPGDK_AMALGAMATION)
30+
31+
link_libraries(${PYTHON_LIBRARIES})
32+
33+
add_samp_plugin(pySAMP
34+
amxplugin.cpp
35+
main.h
36+
main.cpp
37+
main.def
38+
sampgdk.c
39+
sampgdk.h
40+
pysamp/pysamp.cpp
41+
pysamp/pysamp.h
42+
pysamp/pygamemode.cpp
43+
pysamp/pygamemode.h
44+
bindings/callbacks.h
45+
bindings/samp.h
46+
bindings/const.h
47+
bindings/const.cpp
48+
test/callbackstest.h
49+
test/callbackstest.cpp
50+
)
51+
52+
find_package(Doxygen)
53+
if(DOXYGEN_FOUND)
54+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
55+
add_custom_target(doc
56+
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
57+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
58+
COMMENT "Generating API documentation with Doxygen" VERBATIM
59+
)
60+
endif(DOXYGEN_FOUND)

src/Doxyfile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
OUTPUT_DIRECTORY = doc/
2-
OUTPUT_LANGUAGE = English
1+
OUTPUT_DIRECTORY = doc/
2+
OUTPUT_LANGUAGE = English
33
EXTRACT_ALL = YES

0 commit comments

Comments
 (0)