diff --git a/.gitignore b/.gitignore index 46749560..4f7f04a8 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,5 @@ x64 *.project *.settings/ server/gameserver/.gitignore -gameserver.cbp \ No newline at end of file +gameserver.cbp +behaviac_generated \ No newline at end of file diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index 37d338cf..d6744bf0 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -11,12 +11,8 @@ else() message("debug mode") endif() -if (${LIB_DIR}) - message(LIB_DIR: ${LIB_DIR}) -else() - set(LIB_DIR ) - message(LIB_DIR: ${LIB_DIR} ) -endif() +set(LIB_DIR "ubuntu20.04_g++-9") +message(LIB_DIR: ${LIB_DIR} ) set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DNEWGS -DPVE -DMAP3D") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DNEWGS -DPVE -DMAP3D") @@ -34,6 +30,8 @@ include_directories( ../../third_party/recastnavigation/Recast/Include ../../third_party/recastnavigation/Detour/Include ../../third_party/recastnavigation/DetourTileCache/Include + behaviac_generated/types + behaviac_generated/types/internal . ) @@ -66,6 +64,10 @@ aux_source_directory(../../third_party/recastnavigation/DetourTileCache/Source SRC_LIST ) +aux_source_directory(behaviac_generated/types/internal + SRC_LIST +) + execute_process( COMMAND touch -a cs_proto.pb.h COMMAND touch -a cs_proto.pb.cc @@ -116,7 +118,7 @@ target_link_libraries( if (CMAKE_BUILD_TYPE STREQUAL "Debug") target_link_libraries( gameserver${GAME_ID} - behaviac_gcc_release + behaviac_gcc_debug ) else() target_link_libraries( diff --git a/server/gameserver/android_agent.cc b/server/gameserver/android_agent.cc new file mode 100644 index 00000000..d93c6ae3 --- /dev/null +++ b/server/gameserver/android_agent.cc @@ -0,0 +1,13 @@ +#include "precompile.h" + +#include "android_agent.h" + +AndroidAgent::AndroidAgent() +{ + +} + +AndroidAgent::~AndroidAgent() +{ + +} diff --git a/server/gameserver/android_agent.h b/server/gameserver/android_agent.h new file mode 100644 index 00000000..70e687db --- /dev/null +++ b/server/gameserver/android_agent.h @@ -0,0 +1,16 @@ +#ifndef _BEHAVIAC_ANDROIDAGENT_H_ +#define _BEHAVIAC_ANDROIDAGENT_H_ + +#include "behaviac_headers.h" + +class AndroidAgent : public behaviac::Agent +{ +public: + AndroidAgent(); + + virtual ~AndroidAgent(); + + BEHAVIAC_DECLARE_AGENTTYPE(AndroidAgent, behaviac::Agent) +}; + +#endif