Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite978924

Browse files
committed
3.6.31
1 parentf98ca07 commite978924

File tree

94 files changed

+2673
-425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+2673
-425
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ cmake_minimum_required (VERSION 2.8)
3131
# set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Profile" CACHE STRING "" FORCE)
3232
set(CMAKE_CONFIGURATION_TYPES"Debug;Release"CACHESTRING"" FORCE)
3333

34-
set (BEHAVIAC_PACKAGE_VERSION 3.6.30)
34+
set (BEHAVIAC_PACKAGE_VERSION 3.6.31)
3535

3636
#option( BUILD_SHARED_LIBS "set to OFF to build static libraries" ON )
3737
SET(BUILD_SHARED_LIBSONCACHEBOOL"set to OFF to build static libraries")
@@ -442,6 +442,7 @@ if (NOT BEHAVIAC_ANDROID_STUDIO)
442442
add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_9/cpp")
443443
add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_10/cpp")
444444
add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_11/cpp")
445+
add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_12/cpp")
445446
else()
446447
add_subdirectory ("${PROJECT_SOURCE_DIR}/tutorials/tutorial_11/cpp")
447448
endif()

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/Tencent/behaviac/blob/master/license.txt)
2-
[![Release Version](https://img.shields.io/badge/release-3.6.30-red.svg)](https://github.com/Tencent/behaviac/releases)
2+
[![Release Version](https://img.shields.io/badge/release-3.6.31-red.svg)](https://github.com/Tencent/behaviac/releases)
33
[![Updates](https://img.shields.io/badge/Platform-%20iOS%20%7C%20OS%20X%20%7C%20Android%20%7C%20Windows%20%7C%20Linux%20-brightgreen.svg)](https://github.com/Tencent/behaviac/blob/master/history.txt)
44
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/behaviac/pulls)
55

‎docs/behaviac.chm‎

-408 Bytes
Binary file not shown.

‎history.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
2017-4-24 3.6.31
2+
Fix a bug for generating the codes of the Task and Event.
3+
Fix a bug for the hotreload of the meta file.
4+
Add the tutorial_12.
5+
16
2017-4-20 3.6.30
27
Supporot the hot reload of the meta file.
38
Ignore the System_Object as the type of the property.
49
Fix a bug for the IfElse node.
510
Fix a bug for generating the namespace of the enum.
11+
Add the tutorial_10 and tutorial_11.
612

713
2017-4-11 3.6.29
814
Fix a bug of compiling error for GCC.

‎inc/behaviac/common/_config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#defineBEHAVIAC_RELEASE 0
1212
#endif
1313

14-
#defineBEHAVIAC_VERSION_STRING "3.6.30"
14+
#defineBEHAVIAC_VERSION_STRING "3.6.31"
1515

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.30
1+
3.6.31
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.30
1+
3.6.31

‎projects/gmake/tutorial_12.make‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
# GNU Make project makefile autogenerated by Premake
2+
ifndefconfig
3+
config=debugstatic32
4+
endif
5+
6+
ifndefverbose
7+
SILENT = @
8+
endif
9+
10+
CC = gcc
11+
CXX = g++
12+
AR = ar
13+
14+
ifndefRESCOMP
15+
ifdef WINDRES
16+
RESCOMP =$(WINDRES)
17+
else
18+
RESCOMP = windres
19+
endif
20+
endif
21+
22+
ifeq ($(config),debugstatic32)
23+
OBJDIR = ../../intermediate/debugstatic/gmake/tutorial_12/x32
24+
TARGETDIR = ../../bin
25+
TARGET =$(TARGETDIR)/tutorial_12_debugstatic_win32_gmake.exe
26+
DEFINES += -DWIN32 -D_DEBUG -DDEBUG
27+
INCLUDES += -I../../inc -I../../inc -ID:/include
28+
ALL_CPPFLAGS +=$(CPPFLAGS) -MMD -MP$(DEFINES)$(INCLUDES)
29+
ALL_CFLAGS +=$(CFLAGS)$(ALL_CPPFLAGS)$(ARCH) -g -Wall -Wextra -ffast-math -m32 -Wno-invalid-offsetof -Wno-array-bounds -Wno-unused-local-typedefs -Wno-maybe-uninitialized -finput-charset=UTF-8
30+
ALL_CXXFLAGS +=$(CXXFLAGS)$(ALL_CFLAGS) -fno-exceptions
31+
ALL_RESFLAGS +=$(RESFLAGS)$(DEFINES)$(INCLUDES)
32+
ALL_LDFLAGS +=$(LDFLAGS) -L../../lib -m32 -L/usr/lib32
33+
LDDEPS += ../../lib/libbehaviac_debugstatic_win32_gmake.a
34+
LIBS +=$(LDDEPS)
35+
LINKCMD =$(CXX) -o$(TARGET)$(OBJECTS)$(RESOURCES)$(ARCH)$(ALL_LDFLAGS)$(LIBS)
36+
define PREBUILDCMDS
37+
endef
38+
define PRELINKCMDS
39+
endef
40+
define POSTBUILDCMDS
41+
endef
42+
endif
43+
44+
ifeq ($(config),releasestatic32)
45+
OBJDIR = ../../intermediate/releasestatic/gmake/tutorial_12/x32
46+
TARGETDIR = ../../bin
47+
TARGET =$(TARGETDIR)/tutorial_12_releasestatic_win32_gmake.exe
48+
DEFINES += -DWIN32 -DNDEBUG -D_CONSOLE
49+
INCLUDES += -I../../inc -I../../inc -ID:/include
50+
ALL_CPPFLAGS +=$(CPPFLAGS) -MMD -MP$(DEFINES)$(INCLUDES)
51+
ALL_CFLAGS +=$(CFLAGS)$(ALL_CPPFLAGS)$(ARCH) -O2 -Wall -Wextra -ffast-math -m32 /Ox /Oi /Ob1 /Ot -Wno-invalid-offsetof -Wno-array-bounds -Wno-unused-local-typedefs -Wno-maybe-uninitialized -finput-charset=UTF-8
52+
ALL_CXXFLAGS +=$(CXXFLAGS)$(ALL_CFLAGS) -fno-exceptions
53+
ALL_RESFLAGS +=$(RESFLAGS)$(DEFINES)$(INCLUDES)
54+
ALL_LDFLAGS +=$(LDFLAGS) -L../../lib -s -m32 -L/usr/lib32
55+
LDDEPS += ../../lib/libbehaviac_releasestatic_win32_gmake.a
56+
LIBS +=$(LDDEPS)
57+
LINKCMD =$(CXX) -o$(TARGET)$(OBJECTS)$(RESOURCES)$(ARCH)$(ALL_LDFLAGS)$(LIBS)
58+
define PREBUILDCMDS
59+
endef
60+
define PRELINKCMDS
61+
endef
62+
define POSTBUILDCMDS
63+
endef
64+
endif
65+
66+
OBJECTS :=\
67+
$(OBJDIR)/tutorial_12.o\
68+
$(OBJDIR)/behaviac_agent_meta.o\
69+
$(OBJDIR)/FirstAgent.o\
70+
71+
RESOURCES :=\
72+
73+
SHELLTYPE := msdos
74+
ifeq (,$(ComSpec)$(COMSPEC))
75+
SHELLTYPE := posix
76+
endif
77+
ifeq (/bin,$(findstring /bin,$(SHELL)))
78+
SHELLTYPE := posix
79+
endif
80+
81+
.PHONY: clean prebuild prelink
82+
83+
all:$(TARGETDIR)$(OBJDIR) prebuild prelink$(TARGET)
84+
@:
85+
86+
$(TARGET):$(GCH)$(OBJECTS)$(LDDEPS)$(RESOURCES)
87+
@echo Linking tutorial_12
88+
$(SILENT)$(LINKCMD)
89+
$(POSTBUILDCMDS)
90+
91+
$(TARGETDIR):
92+
@echo Creating$(TARGETDIR)
93+
ifeq (posix,$(SHELLTYPE))
94+
$(SILENT) mkdir -p $(TARGETDIR)
95+
else
96+
$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
97+
endif
98+
99+
$(OBJDIR):
100+
@echo Creating$(OBJDIR)
101+
ifeq (posix,$(SHELLTYPE))
102+
$(SILENT) mkdir -p $(OBJDIR)
103+
else
104+
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
105+
endif
106+
107+
clean:
108+
@echo Cleaning tutorial_12
109+
ifeq (posix,$(SHELLTYPE))
110+
$(SILENT) rm -f $(TARGET)
111+
$(SILENT) rm -rf $(OBJDIR)
112+
else
113+
$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
114+
$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
115+
endif
116+
117+
prebuild:
118+
$(PREBUILDCMDS)
119+
120+
prelink:
121+
$(PRELINKCMDS)
122+
123+
ifneq (,$(PCH))
124+
.NOTPARALLEL:$(GCH)$(PCH)
125+
$(GCH):$(PCH)
126+
@echo$(notdir$<)
127+
$(SILENT)$(CXX) -x c++-header$(ALL_CXXFLAGS) -MMD -MP$(DEFINES)$(INCLUDES) -o"$@" -MF"$(@:%.gch=%.d)" -c"$<"
128+
endif
129+
130+
$(OBJDIR)/tutorial_12.o: ../../tutorials/tutorial_12/cpp/tutorial_12.cpp
131+
@echo$(notdir$<)
132+
$(SILENT)$(CXX)$(ALL_CXXFLAGS)$(FORCE_INCLUDE) -o"$@" -MF$(@:%.o=%.d) -c"$<"
133+
134+
$(OBJDIR)/behaviac_agent_meta.o: ../../tutorials/tutorial_12/cpp/behaviac_generated/types/internal/behaviac_agent_meta.cpp
135+
@echo$(notdir$<)
136+
$(SILENT)$(CXX)$(ALL_CXXFLAGS)$(FORCE_INCLUDE) -o"$@" -MF$(@:%.o=%.d) -c"$<"
137+
138+
$(OBJDIR)/FirstAgent.o: ../../tutorials/tutorial_12/cpp/behaviac_generated/types/internal/FirstAgent.cpp
139+
@echo$(notdir$<)
140+
$(SILENT)$(CXX)$(ALL_CXXFLAGS)$(FORCE_INCLUDE) -o"$@" -MF$(@:%.o=%.d) -c"$<"
141+
142+
-include$(OBJECTS:%.o=%.d)
143+
ifneq (,$(PCH))
144+
-include$(OBJDIR)/$(notdir$(PCH)).d
145+
endif

‎projects/vs2010/behaviac.sln‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tutorial_11", "tutorial_11.
9393
{332CEEDC-7568-D84C-B9C6-B710915836ED} ={332CEEDC-7568-D84C-B9C6-B710915836ED}
9494
EndProjectSection
9595
EndProject
96+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") ="tutorial_12","tutorial_12.vcxproj","{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}"
97+
ProjectSection(ProjectDependencies) =postProject
98+
{332CEEDC-7568-D84C-B9C6-B710915836ED} ={332CEEDC-7568-D84C-B9C6-B710915836ED}
99+
EndProjectSection
100+
EndProject
96101
Global
97102
GlobalSection(SolutionConfigurationPlatforms) =preSolution
98103
DebugStatic|Win32=DebugStatic|Win32
@@ -253,6 +258,14 @@ Global
253258
{F887BDB1-EFE5-5448-8B0E-A7B341746F68}.DebugDLL|Win32.Build.0=DebugDLL|Win32
254259
{F887BDB1-EFE5-5448-8B0E-A7B341746F68}.ReleaseDLL|Win32.ActiveCfg=ReleaseDLL|Win32
255260
{F887BDB1-EFE5-5448-8B0E-A7B341746F68}.ReleaseDLL|Win32.Build.0=ReleaseDLL|Win32
261+
{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.DebugStatic|Win32.ActiveCfg=DebugStatic|Win32
262+
{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.DebugStatic|Win32.Build.0=DebugStatic|Win32
263+
{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.ReleaseStatic|Win32.ActiveCfg=ReleaseStatic|Win32
264+
{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.ReleaseStatic|Win32.Build.0=ReleaseStatic|Win32
265+
{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.DebugDLL|Win32.ActiveCfg=DebugDLL|Win32
266+
{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.DebugDLL|Win32.Build.0=DebugDLL|Win32
267+
{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.ReleaseDLL|Win32.ActiveCfg=ReleaseDLL|Win32
268+
{B56BC190-EEC3-A24E-88BB-6D6DE97345CB}.ReleaseDLL|Win32.Build.0=ReleaseDLL|Win32
256269
EndGlobalSection
257270
GlobalSection(SolutionProperties) =preSolution
258271
HideSolutionNode =FALSE

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp