@@ -106,6 +106,9 @@ sub mkvcbuild
106
106
$postgres -> AddFiles(' src\port' ,@pgportfiles );
107
107
$postgres -> AddFiles(' src\common' ,@pgcommonbkndfiles );
108
108
$postgres -> AddDir(' src\timezone' );
109
+ # We need source files from src\timezone, but that directory's resource
110
+ # file pertains to "zic", not to the backend.
111
+ $postgres -> RemoveFile(' src\timezone\win32ver.rc' );
109
112
$postgres -> AddFiles(' src\backend\parser' ,' scan.l' ,' gram.y' );
110
113
$postgres -> AddFiles(' src\backend\bootstrap' ,' bootscanner.l' ,
111
114
' bootparse.y' );
@@ -126,10 +129,11 @@ sub mkvcbuild
126
129
127
130
my $snowball =$solution -> AddProject(' dict_snowball' ,' dll' ,' ' ,
128
131
' src\backend\snowball' );
132
+ # This Makefile uses VPATH to find most source files in a subdirectory.
129
133
$snowball -> RelocateFiles(
130
134
' src\backend\snowball\libstemmer' ,
131
135
sub {
132
- return shift !~/ dict_snowball.c$ / ;
136
+ return shift !~/ ( dict_snowball.c|win32ver.rc) $ / ;
133
137
});
134
138
$snowball -> AddIncludeDir(' src\include\snowball' );
135
139
$snowball -> AddReference($postgres );
@@ -341,6 +345,7 @@ sub mkvcbuild
341
345
$pgregress_ecpg -> AddIncludeDir(' src\test\regress' );
342
346
$pgregress_ecpg -> AddDefine(' HOST_TUPLE="i686-pc-win32vc"' );
343
347
$pgregress_ecpg -> AddDefine(' FRONTEND' );
348
+ $pgregress_ecpg -> AddDirResourceFile(' src\interfaces\ecpg\test' );
344
349
$pgregress_ecpg -> AddReference($libpgcommon ,$libpgport );
345
350
346
351
my $isolation_tester =
@@ -356,6 +361,7 @@ sub mkvcbuild
356
361
$isolation_tester -> AddDefine(' HOST_TUPLE="i686-pc-win32vc"' );
357
362
$isolation_tester -> AddDefine(' FRONTEND' );
358
363
$isolation_tester -> AddLibrary(' ws2_32.lib' );
364
+ $isolation_tester -> AddDirResourceFile(' src\test\isolation' );
359
365
$isolation_tester -> AddReference($libpq ,$libpgcommon ,$libpgport );
360
366
361
367
my $pgregress_isolation =
@@ -366,6 +372,7 @@ sub mkvcbuild
366
372
$pgregress_isolation -> AddIncludeDir(' src\test\regress' );
367
373
$pgregress_isolation -> AddDefine(' HOST_TUPLE="i686-pc-win32vc"' );
368
374
$pgregress_isolation -> AddDefine(' FRONTEND' );
375
+ $pgregress_isolation -> AddDirResourceFile(' src\test\isolation' );
369
376
$pgregress_isolation -> AddReference($libpgcommon ,$libpgport );
370
377
371
378
# src/bin
@@ -448,6 +455,7 @@ sub mkvcbuild
448
455
my $zic =$solution -> AddProject(' zic' ,' exe' ,' utils' );
449
456
$zic -> AddFiles(' src\timezone' ,' zic.c' ,' ialloc.c' ,' scheck.c' ,
450
457
' localtime.c' );
458
+ $zic -> AddDirResourceFile(' src\timezone' );
451
459
$zic -> AddReference($libpgcommon ,$libpgport );
452
460
453
461
if ($solution -> {options }-> {xml })
@@ -582,21 +590,22 @@ sub mkvcbuild
582
590
$proj -> AddIncludeDir(' src\bin\pg_dump' );
583
591
$proj -> AddIncludeDir(' src\bin\psql' );
584
592
$proj -> AddReference($libpq ,$libpgcommon ,$libpgport );
585
- $proj -> AddResourceFile(' src\bin\scripts' ,' PostgreSQL Utility' ,
586
- ' win32' );
593
+ $proj -> AddDirResourceFile(' src\bin\scripts' );
587
594
$proj -> AddLibrary(' ws2_32.lib' );
588
595
}
589
596
590
597
# Regression DLL and EXE
591
598
my $regress =$solution -> AddProject(' regress' ,' dll' ,' misc' );
592
599
$regress -> AddFile(' src\test\regress\regress.c' );
600
+ $regress -> AddDirResourceFile(' src\test\regress' );
593
601
$regress -> AddReference($postgres );
594
602
595
603
my $pgregress =$solution -> AddProject(' pg_regress' ,' exe' ,' misc' );
596
604
$pgregress -> AddFile(' src\test\regress\pg_regress.c' );
597
605
$pgregress -> AddFile(' src\test\regress\pg_regress_main.c' );
598
606
$pgregress -> AddIncludeDir(' src\port' );
599
607
$pgregress -> AddDefine(' HOST_TUPLE="i686-pc-win32vc"' );
608
+ $pgregress -> AddDirResourceFile(' src\test\regress' );
600
609
$pgregress -> AddReference($libpgcommon ,$libpgport );
601
610
602
611
# fix up pg_xlogdump once it's been set up