savepoint, changelog later..
This commit is contained in:
parent
7d3c4a0be0
commit
1bc1fd1913
45 changed files with 12866 additions and 10981 deletions
|
|
@ -11,18 +11,19 @@ PROJECT = yapb
|
|||
SOURCES = ../source
|
||||
OBJECTS = $(wildcard $(SOURCES)/*.cpp)
|
||||
|
||||
COMPILER_FLAGS = -mtune=generic -std=c++11 -m32 -Wall -Wextra -Werror -fno-exceptions -fno-rtti -DPOSIX
|
||||
LINKER_FLAGS = -m32
|
||||
COMPILER_FLAGS = -std=c++11 -m32 -Wall -Wextra -Werror -fno-exceptions -fno-rtti
|
||||
LINKER_FLAGS = -m32 -ldl
|
||||
|
||||
ifeq "$(DEBUG)" "true"
|
||||
COMPILER_FLAGS += -D_DEBUG -DDEBUG -g3
|
||||
COMPILER_FLAGS += -g3 -DCR_DEBUG
|
||||
BINARY_DIR = debug
|
||||
else
|
||||
COMPILER_FLAGS += -DNDEBUG -pipe -O3 -msse2 -funroll-loops -fomit-frame-pointer -fno-stack-protector -fvisibility=hidden -fvisibility-inlines-hidden -nostdinc++
|
||||
COMPILER_FLAGS += -pipe -O3 -march=core2 -msse2 -mfpmath=sse -ffast-math -fno-builtin -fno-threadsafe-statics -funroll-loops -fomit-frame-pointer -fno-stack-protector -fvisibility=hidden -fvisibility-inlines-hidden
|
||||
BINARY_DIR = release
|
||||
LINKER_FLAGS += -static-libgcc
|
||||
endif
|
||||
|
||||
INCLUDE = -I../include -I../include/engine
|
||||
INCLUDE = -I../include
|
||||
COMPILER = $(CC)
|
||||
|
||||
ifeq "$(shell uname -s)" "Darwin"
|
||||
|
|
@ -31,11 +32,10 @@ endif
|
|||
|
||||
ifeq "$(OSX)" "true"
|
||||
LIBRARY_EXT = dylib
|
||||
COMPILER_FLAGS += -DOSX -D_OSX -mmacosx-version-min=10.9
|
||||
COMPILER_FLAGS += -mmacosx-version-min=10.9
|
||||
LINKER_FLAGS += -dynamiclib -lstdc++ -mmacosx-version-min=10.9 -arch i386
|
||||
else
|
||||
LIBRARY_EXT = so
|
||||
COMPILER_FLAGS += -DLINUX -D_LINUX
|
||||
LINKER_FLAGS += -shared
|
||||
endif
|
||||
|
||||
|
|
@ -45,16 +45,26 @@ ifeq ($(findstring clang,$(COMPILER)),clang)
|
|||
ifeq "$(OSX)" "false"
|
||||
LINKER_FLAGS += -lgcc_eh
|
||||
else
|
||||
LINKER_FLAGS += -nostdlib++ -Wunused-command-line-argument
|
||||
ifeq "$(DEBUG)" "true"
|
||||
LINKER_FLAGS += -lstdc++
|
||||
else
|
||||
LINKER_FLAGS += -nostdlib++ -Wunused-command-line-argument -fuse-ld=lld -Wl,-z,notext --no-undefined
|
||||
endif
|
||||
endif
|
||||
else ifeq ($(findstring gcc,$(COMPILER)),gcc)
|
||||
ifneq "$(OSX)" "false"
|
||||
LINKER_FLAGS += -static-libgcc
|
||||
COMPILER_FLAGS += -funroll-all-loops -Wno-implicit-fallthrough
|
||||
ifneq "$(DEBUG)" "true"
|
||||
LINKER_FLAGS += -Wl,--no-undefined -flto=thin
|
||||
COMPILER_FLAGS += -funroll-all-loops -flto=thin
|
||||
endif
|
||||
endif
|
||||
else ifeq ($(findstring icc,$(COMPILER)),icc)
|
||||
COMPILER_FLAGS += -funroll-all-loops -no-prec-div -no-inline-min-size -no-inline-max-size -wd11076 -wd11074
|
||||
LINKER_FLAGS += -cxxlib-nostd -static-intel -no-intel-extensions
|
||||
LINKER_FLAGS += -static-intel -no-intel-extensions
|
||||
|
||||
ifneq "$(DEBUG)" "true"
|
||||
COMPILER_FLAGS += -funroll-all-loops -ipo -wd11076 -wd11074
|
||||
LINKER_FLAGS += -cxxlib-nostd -Wl,--no-undefined,-z,notext,--gc-sections -ipo
|
||||
endif
|
||||
endif
|
||||
|
||||
OBJECTS_BIN := $(OBJECTS:%.cpp=$(BINARY_DIR)/%.o)
|
||||
|
|
@ -78,6 +88,7 @@ debug:
|
|||
all:
|
||||
$(MAKE) compile DEBUG=true
|
||||
$(MAKE) compile DEBUG=false
|
||||
|
||||
clean:
|
||||
rm -rf release/*.o
|
||||
rm -rf release/$(BINARY_OUTPUT)
|
||||
|
|
|
|||
|
|
@ -11,10 +11,29 @@
|
|||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\include\compress.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-alloc.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-array.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-basic.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-binheap.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-color.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-complete.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-dict.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-files.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-http.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-lambda.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-library.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-logger.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-math.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-movable.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-platform.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-random.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-string.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-twin.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-ulz.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-uniqueptr.h" />
|
||||
<ClInclude Include="..\include\crlib\cr-vector.h" />
|
||||
<ClInclude Include="..\include\engine\model.h" />
|
||||
<ClInclude Include="..\include\yapb.h" />
|
||||
<ClInclude Include="..\include\corelib.h" />
|
||||
<ClInclude Include="..\include\engine.h" />
|
||||
<ClInclude Include="..\include\engine\const.h" />
|
||||
<ClInclude Include="..\include\engine\eiface.h" />
|
||||
|
|
@ -22,7 +41,6 @@
|
|||
<ClInclude Include="..\include\engine\meta_api.h" />
|
||||
<ClInclude Include="..\include\engine\progdefs.h" />
|
||||
<ClInclude Include="..\include\engine\util.h" />
|
||||
<ClInclude Include="..\include\platform.h" />
|
||||
<ClInclude Include="..\include\resource.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -35,12 +53,13 @@
|
|||
<ClCompile Include="..\source\interface.cpp" />
|
||||
<ClCompile Include="..\source\navigate.cpp" />
|
||||
<ClCompile Include="..\source\support.cpp" />
|
||||
<ClCompile Include="..\source\waypoint.cpp" />
|
||||
<ClCompile Include="..\source\graph.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="yapb.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\source\Android.mk" />
|
||||
<None Include="makefile" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
|
|
@ -108,7 +127,7 @@
|
|||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\include\engine;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<PrecompiledHeader />
|
||||
|
|
@ -181,7 +200,7 @@
|
|||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
|
||||
<AdditionalIncludeDirectories>..\mmgr;..\include\engine;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ExceptionHandling>false</ExceptionHandling>
|
||||
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
|
||||
|
|
|
|||
|
|
@ -13,14 +13,11 @@
|
|||
<Filter Include="include\engine">
|
||||
<UniqueIdentifier>{f98ff5ec-055a-46cd-b5b1-462ef4c1c73e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="include\crlib">
|
||||
<UniqueIdentifier>{76a583d1-8f55-451b-8516-2f7cce4d1875}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\include\compress.h">
|
||||
<Filter>include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\corelib.h">
|
||||
<Filter>include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\resource.h">
|
||||
<Filter>include</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -42,9 +39,6 @@
|
|||
<ClInclude Include="..\include\engine\util.h">
|
||||
<Filter>include\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\platform.h">
|
||||
<Filter>include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\engine.h">
|
||||
<Filter>include</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -54,6 +48,69 @@
|
|||
<ClInclude Include="..\include\engine\model.h">
|
||||
<Filter>include\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-alloc.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-array.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-basic.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-binheap.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-complete.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-dict.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-files.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-http.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-lambda.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-library.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-logger.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-math.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-movable.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-platform.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-random.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-string.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-twin.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-ulz.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-uniqueptr.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-vector.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\crlib\cr-color.h">
|
||||
<Filter>include\crlib</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\source\chatlib.cpp">
|
||||
|
|
@ -68,9 +125,6 @@
|
|||
<ClCompile Include="..\source\support.cpp">
|
||||
<Filter>source</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\source\waypoint.cpp">
|
||||
<Filter>source</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\source\manager.cpp">
|
||||
<Filter>source</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -80,10 +134,13 @@
|
|||
<ClCompile Include="..\source\engine.cpp">
|
||||
<Filter>source</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\source\control.cpp">
|
||||
<Filter>source</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\source\basecode.cpp">
|
||||
<Filter>source</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\source\control.cpp">
|
||||
<ClCompile Include="..\source\graph.cpp">
|
||||
<Filter>source</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
|
@ -96,5 +153,8 @@
|
|||
<None Include="makefile">
|
||||
<Filter>project</Filter>
|
||||
</None>
|
||||
<None Include="..\source\Android.mk">
|
||||
<Filter>project</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Loading…
Add table
Add a link
Reference in a new issue