Diz_C0. Version 3.1

Maximus5 · Apr 2, 2015 · 0fef697 · 0fef697
1 parent 6032a33
commit 0fef697
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/Col0/diz_c0/.gitignore b/Col0/diz_c0/.gitignore
@@ -11,3 +11,5 @@
 *.tlog
 *.lastbuildstate
 *.res
+*.pch
+*.dep
diff --git a/Col0/diz_c0/build_diz.bat b/Col0/diz_c0/build_diz.bat
@@ -2,14 +2,14 @@
 
 set MAKEFILE=makefile_vc
 
-call "%VS90COMNTOOLS%..\..\VC\BIN\vcvars32.bat"
+call "%~dp0..\..\tools\vc.build.set.x32.bat"
 
 set WIDE=1
 set IA64=
 set AMD64=
 
 nmake /A /B /F %MAKEFILE%
 
-call "%VS90COMNTOOLS%..\..\VC\BIN\vcvarsx86_amd64.bat"
+call "%~dp0..\..\tools\vc.build.set.x64.bat"
 set AMD64=1
 nmake /A /B /F %MAKEFILE%
diff --git a/Col0/diz_c0/diz_c0.cpp b/Col0/diz_c0/diz_c0.cpp
@@ -95,6 +95,12 @@ int WINAPI GetMinFarVersionW(void)
 }
 #endif
 
+#if FAR_UNICODE>=4200
+#pragma message("FAR_UNICODE>=4200")
+#else
+#pragma message("FAR_UNICODE<4200")
+#endif
+
 void WINAPI GetGlobalInfoW(struct GlobalInfo *Info)
 {
 	//_ASSERTE(Info->StructSize >= sizeof(GlobalInfo));

diff --git a/Col0/diz_c0/makefile_vc b/Col0/diz_c0/makefile_vc
@@ -85,8 +85,8 @@ OUTDIR=$(DIRNAME).$(DIRBIT).vc
 
 LINK=link.exe
 ULINK=ulink.exe
-M4=tools\m4 -P -DFARBIT=$(DIRBIT)
-GAWK=..\tools\gawk
+M4=..\..\tools\m4 -P -DFARBIT=$(DIRBIT)
+GAWK=..\..\tools\gawk
 
 INTDIR=$(OUTDIR)\obj
 !ifdef FARSYSLOG
@@ -149,6 +149,7 @@ UCD_OBJS=\
 LINK_LIBS=kernel32.lib user32.lib winspool.lib advapi32.lib shell32.lib mpr.lib ole32.lib secur32.lib
 
 DEFINES=\
+	/DFAR_UNICODE=4245 \
 	/D "UNICODE"\
 	/D "_UNICODE"\
 	/D "$(USEDEBUG)"\
@@ -216,7 +217,7 @@ ALL: AllDirs lng depfile
 .PHONY: lng
 lng: dizlang.templ
 	echo generating language files
-	..\tools\lng.generator.exe -nc -i dizlang.ini -ol . dizlang.templ
+	..\..\tools\lng.generator.exe -nc -i dizlang.ini -ol . dizlang.templ
 
 .PHONY: depfile
 depfile:

diff --git a/Col0/diz_c0/version.h b/Col0/diz_c0/version.h
@@ -1,6 +1,6 @@
 
 #define MVV_1 3
-#define MVV_2 0
+#define MVV_2 1
 #define MVV_3 0
 #define MVV_4 0
 #define MVV_4a ""
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,3 +11,5 @@ @@
     *.tlog
     *.lastbuildstate
     *.res
+    *.pch
+    *.dep