From: <ct...@us...> - 2011-02-23 18:28:46
|
Revision: 1655 http://colorer.svn.sourceforge.net/colorer/?rev=1655&view=rev Author: ctapmex Date: 2011-02-23 18:28:40 +0000 (Wed, 23 Feb 2011) Log Message: ----------- correct project files for new path "far3sdk" Modified Paths: -------------- trunk/far3colorer/changelog trunk/far3colorer/src/_dependencies.dep trunk/far3colorer/src/makefile.cygwin trunk/far3colorer/src/makefile.mingw trunk/far3colorer/src/makefile.vc trunk/far3colorer/src/pcolorer2.rc trunk/far3colorer/src/pcolorer2.vcproj Modified: trunk/far3colorer/changelog =================================================================== --- trunk/far3colorer/changelog 2011-02-23 18:12:04 UTC (rev 1654) +++ trunk/far3colorer/changelog 2011-02-23 18:28:40 UTC (rev 1655) @@ -1,5 +1,11 @@ -$Revision$ - $Author$ $Date$ +#Revision: 1653-1655 + Author: ctapmex $Date$ + 1. готовимся к Far3 + 2. Обновлено far sdk. учитываем , что оно не окончательно + 3. исправлены все файлы проектов на новое имя папки + +#Revision: 1636 + Author: ctapmex Date: 2011-01-10 14:25:29 +0500 (Пн, 10 янв 2011) 1. загатовка для help, или уже minihelp. Можно использовать на сайте #Revision: 1632 Modified: trunk/far3colorer/src/_dependencies.dep =================================================================== --- trunk/far3colorer/src/_dependencies.dep 2011-02-23 18:12:04 UTC (rev 1654) +++ trunk/far3colorer/src/_dependencies.dep 2011-02-23 18:28:40 UTC (rev 1655) @@ -34,12 +34,12 @@ $(shared_path)colorer/editor/PairMatch.h \ $(shared_path)colorer/editor/Outliner.h \ $(shared_path)colorer/editor/OutlineItem.h pcolorer.h \ - ../far2sdk/plugin.hpp \ - ../far2sdk/farkeys.hpp $(shared_path)common/Logging.h + ../far3sdk/plugin.hpp \ + ../far3sdk/farkeys.hpp $(shared_path)common/Logging.h $(obj_output_slash)FarEditorSet.$(obj): FarEditorSet.cpp \ - ../far2sdk/farcolor.hpp registry_wide.h \ + ../far3sdk/farcolor.hpp registry_wide.h \ $(shared_path)unicode/Encodings.h $(shared_path)unicode/String.h \ $(shared_path)common/Exception.h $(shared_path)unicode/Character.h \ $(shared_path)common/Common.h $(shared_path)common/Features.h \ @@ -74,14 +74,14 @@ $(shared_path)colorer/handlers/LineRegionsCompactSupport.h \ $(shared_path)colorer/editor/PairMatch.h \ $(shared_path)colorer/viewer/TextLinesStore.h FarEditorSet.h pcolorer.h \ - ../far2sdk/plugin.hpp ../far2sdk/farkeys.hpp \ + ../far3sdk/plugin.hpp ../far3sdk/farkeys.hpp \ FarEditor.h $(shared_path)colorer/editor/Outliner.h \ $(shared_path)colorer/editor/OutlineItem.h $(obj_output_slash)pcolorer.$(obj): pcolorer.cpp \ - ../far2sdk/plugin.hpp pcolorer.h \ - ../far2sdk/farkeys.hpp FarEditorSet.h \ + ../far3sdk/plugin.hpp pcolorer.h \ + ../far3sdk/farkeys.hpp FarEditorSet.h \ $(shared_path)colorer/handlers/FileErrorHandler.h \ $(shared_path)common/io/StreamWriter.h $(shared_path)common/io/Writer.h \ $(shared_path)unicode/String.h $(shared_path)common/Exception.h \ Modified: trunk/far3colorer/src/makefile.cygwin =================================================================== --- trunk/far3colorer/src/makefile.cygwin 2011-02-23 18:12:04 UTC (rev 1654) +++ trunk/far3colorer/src/makefile.cygwin 2011-02-23 18:28:40 UTC (rev 1655) @@ -7,7 +7,7 @@ shared_path=../../colorer/src/shared/ obj_output=objs -CPPFLAGS_CUSTOM+=-I../far2sdk -DUNICODE -D_UNICODE -D__CYGWIN__ -DWINVER=0x0500 -DCOLORER_FEATURE_USE_DL_MALLOC=FALSE -DCOLORER_FEATURE_USE_CHUNK_ALLOC=FALSE +CPPFLAGS_CUSTOM+=-I../far3sdk -DUNICODE -D_UNICODE -D__CYGWIN__ -DWINVER=0x0500 -DCOLORER_FEATURE_USE_DL_MALLOC=FALSE -DCOLORER_FEATURE_USE_CHUNK_ALLOC=FALSE #CPPFLAGS_CUSTOM += -DCOLORER_FEATURE_LOGLEVEL=COLORER_FEATURE_LOGLEVEL_FULL include $(shared_path)makefile.colorer.cygwin Modified: trunk/far3colorer/src/makefile.mingw =================================================================== --- trunk/far3colorer/src/makefile.mingw 2011-02-23 18:12:04 UTC (rev 1654) +++ trunk/far3colorer/src/makefile.mingw 2011-02-23 18:28:40 UTC (rev 1655) @@ -25,7 +25,7 @@ CPPFLAGS_CUSTOM= -DUNICODE -D_UNICODE -DWINVER=0x0500 -DCOLORER_FEATURE_USE_DL_MALLOC=TRUE -DCOLORER_FEATURE_USE_CHUNK_ALLOC=TRUE CPPFLAGS_CUSTOM+= -DCOLORER_FEATURE_LOGLEVEL=COLORER_FEATURE_LOGLEVEL_QUIET -DUSE_DL_PREFIX CPPFLAGS_OPTIM= -O3 -Wall -CPPFLAGS =-I../far2sdk -I$(shared_path) -I$(unzipdir) $(CPPFLAGS_CUSTOM) $(CPPFLAGS_OPTIM) -mwin32 -c -o $*.$(obj) +CPPFLAGS =-I../far3sdk -I$(shared_path) -I$(unzipdir) $(CPPFLAGS_CUSTOM) $(CPPFLAGS_OPTIM) -mwin32 -c -o $*.$(obj) LNKFLAGS = -mdll -s -lwininet -lstdc++ Modified: trunk/far3colorer/src/makefile.vc =================================================================== --- trunk/far3colorer/src/makefile.vc 2011-02-23 18:12:04 UTC (rev 1654) +++ trunk/far3colorer/src/makefile.vc 2011-02-23 18:28:40 UTC (rev 1655) @@ -33,7 +33,7 @@ shared_path=../../colorer/src/shared/ CPPFLAGS_CUSTOM = $(CPPFLAGS_CUSTOM) /D "COLORER_FEATURE_USE_DL_MALLOC=FALSE" /D "COLORER_FEATURE_USE_CHUNK_ALLOC=FALSE" -CPPFLAGS_CUSTOM = $(CPPFLAGS_CUSTOM) /I "../far2sdk" +CPPFLAGS_CUSTOM = $(CPPFLAGS_CUSTOM) /I "../far3sdk" CPPFLAGS_CUSTOM = $(CPPFLAGS_CUSTOM) /Fo"$(obj_output)\\" /D "_USRDLL" /D "_CRT_SECURE_NO_DEPRECATE" /D "_WINDLL" /D "_UNICODE" /D "UNICODE" include ../../colorer/src/shared/makefile.colorer.vc Modified: trunk/far3colorer/src/pcolorer2.rc =================================================================== --- trunk/far3colorer/src/pcolorer2.rc 2011-02-23 18:12:04 UTC (rev 1654) +++ trunk/far3colorer/src/pcolorer2.rc 2011-02-23 18:28:40 UTC (rev 1655) @@ -53,8 +53,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,3,0 - PRODUCTVERSION 1,0,3,0 + FILEVERSION 1,0,3,1 + PRODUCTVERSION 1,0,3,1 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,16 +70,16 @@ BLOCK "041904b0" BEGIN #ifdef _WIN64 - VALUE "FileDescription", "Colorer - Syntax Highlighting for FAR2 (x64)" + VALUE "FileDescription", "Colorer - Syntax Highlighting for FAR3 (x64)" #else - VALUE "FileDescription", "Colorer - Syntax Highlighting for FAR2" + VALUE "FileDescription", "Colorer - Syntax Highlighting for FAR3" #endif - VALUE "FileVersion", "1, 0, 3, 0" + VALUE "FileVersion", "1, 0, 3, 1" VALUE "InternalName", "colorer" - VALUE "LegalCopyright", "Copyright (C) 2009-2010" + VALUE "LegalCopyright", "Copyright (C) 2009-2011" VALUE "OriginalFilename", "colorer.dll" VALUE "ProductName", "Colorer library" - VALUE "ProductVersion", "1, 0, 3, 0" + VALUE "ProductVersion", "1, 0, 3, 1" END END BLOCK "VarFileInfo" Modified: trunk/far3colorer/src/pcolorer2.vcproj =================================================================== --- trunk/far3colorer/src/pcolorer2.vcproj 2011-02-23 18:12:04 UTC (rev 1654) +++ trunk/far3colorer/src/pcolorer2.vcproj 2011-02-23 18:28:40 UTC (rev 1655) @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories="..\..\colorer\src\shared;..\..\colorer\src\zlib;..\far2sdk" + AdditionalIncludeDirectories="..\..\colorer\src\shared;..\..\colorer\src\zlib;..\far3sdk" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;COLORER_FEATURE_USE_DL_MALLOC=TRUE;COLORER_FEATURE_USE_CHUNK_ALLOC=FALSE;_CRT_SECURE_NO_DEPRECATE;COLORER_FEATURE_LOGLEVEL=COLORER_FEATURE_LOGLEVEL_QUIET;USE_DL_PREFIX" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -133,7 +133,7 @@ Name="VCCLCompilerTool" AdditionalOptions="" Optimization="0" - AdditionalIncludeDirectories="..\..\colorer\src\shared;..\..\colorer\src\zlib;..\far2sdk" + AdditionalIncludeDirectories="..\..\colorer\src\shared;..\..\colorer\src\zlib;..\far3sdk" PreprocessorDefinitions="_WIN64;_DEBUG;_CONSOLE;COLORER_FEATURE_USE_DL_MALLOC=TRUE;COLORER_FEATURE_USE_CHUNK_ALLOC=FALSE;_CRT_SECURE_NO_DEPRECATE;USE_DL_PREFIX" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -225,7 +225,7 @@ InlineFunctionExpansion="0" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\..\colorer\src\shared;..\..\colorer\src\zlib;..\far2sdk" + AdditionalIncludeDirectories="..\..\colorer\src\shared;..\..\colorer\src\zlib;..\far3sdk" PreprocessorDefinitions="WIN32;NDEBUG;_USRDLL;COLORER_FEATURE_USE_DL_MALLOC=TRUE;COLORER_FEATURE_USE_CHUNK_ALLOC=FALSE;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;COLORER_FEATURE_LOGLEVEL=COLORER_FEATURE_LOGLEVEL_QUIET;USE_DL_PREFIX" StringPooling="true" RuntimeLibrary="0" @@ -322,7 +322,7 @@ InlineFunctionExpansion="0" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\..\colorer\src\shared;..\..\colorer\src\zlib;..\far2sdk" + AdditionalIncludeDirectories="..\..\colorer\src\shared;..\..\colorer\src\zlib;..\far3sdk" PreprocessorDefinitions="_WIN64;NDEBUG;_USRDLL;COLORER_FEATURE_USE_DL_MALLOC=TRUE;COLORER_FEATURE_USE_CHUNK_ALLOC=FALSE;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;COLORER_FEATURE_LOGLEVEL=COLORER_FEATURE_LOGLEVEL_QUIET;USE_DL_PREFIX" StringPooling="true" RuntimeLibrary="0" @@ -403,24 +403,20 @@ </File> </Filter> <Filter - Name="far2sdk" + Name="far3sdk" > <File - RelativePath="..\far2sdk\farcolor.hpp" + RelativePath="..\far3sdk\farcolor.hpp" > </File> <File - RelativePath="..\far2sdk\farkeys.hpp" + RelativePath="..\far3sdk\farkeys.hpp" > </File> <File - RelativePath="..\far2sdk\farversion.hpp" + RelativePath="..\far3sdk\plugin.hpp" > </File> - <File - RelativePath="..\far2sdk\plugin.hpp" - > - </File> </Filter> <Filter Name="pcolorer2" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |