Skip to content

Commit 7ee425c

Browse files
Xottab-DUTYXottab-DUTY
committed
Some fixes for Borland project files
1 parent 24ac9fa commit 7ee425c

File tree

11 files changed

+1242
-1082
lines changed

11 files changed

+1242
-1082
lines changed

‎src/all_editors.bpg

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DCC = $(ROOT)\bin\dcc32.exe $**
1010
BRCC = $(ROOT)\bin\brcc32.exe $**
1111
#------------------------------------------------------------------------------
1212
PROJECTS = xrCoreB.dll xrSoundB.dll xrParticlesB.dll xrEPropsB.dll xrECoreB.dll \
13-
ActorEditor.exe ParticleEditor.exe ShaderEditor.exe LevelEditor.exe
13+
ActorEditor.exe ParticleEditor.exe PostprocessEditor.exe ShaderEditor.exe LevelEditor.exe
1414
#------------------------------------------------------------------------------
1515
default: $(PROJECTS)
1616
#------------------------------------------------------------------------------
@@ -43,6 +43,10 @@ ParticleEditor.exe: editors\ParticleEditor\ParticleEditor.bpr
4343
$(ROOT)\bin\bpr2mak $**
4444
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
4545

46+
PostprocessEditor.exe: editors\PPEditor\Postprocess.bpr
47+
$(ROOT)\bin\bpr2mak $**
48+
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
49+
4650
ShaderEditor.exe: editors\ShaderEditor\ShaderEditor.bpr
4751
$(ROOT)\bin\bpr2mak $**
4852
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

‎src/editors/ActorEditor/ActorEditor.bpr

Lines changed: 136 additions & 120 deletions
Large diffs are not rendered by default.

‎src/editors/ECore/xrECoreB.bpr

Lines changed: 268 additions & 238 deletions
Large diffs are not rendered by default.

‎src/editors/LevelEditor/LevelEditor.bpr

Lines changed: 218 additions & 178 deletions
Large diffs are not rendered by default.

‎src/editors/PPEditor/Postprocess.bpr

Lines changed: 52 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@
33
<PROJECT>
44
<MACROS>
55
<VERSION value="BCB.06.00"/>
6-
<PROJECT value="x:\stalker_addon\binaries\Postprocess.exe"/>
7-
<OBJFILES value="x:\intermediate_ed\ppe\Postprocess.obj x:\intermediate_ed\ppe\main.obj
8-
x:\intermediate_ed\ppe\interp.obj x:\intermediate_ed\ppe\float_param.obj
9-
x:\intermediate_ed\ppe\float_constructor.obj
10-
x:\intermediate_ed\ppe\color.obj x:\intermediate_ed\ppe\single_param.obj
11-
x:\intermediate_ed\ppe\Envelope.obj
12-
x:\intermediate_ed\ppe\PostprocessAnimator.obj"/>
6+
<PROJECT value="..\..\..\bin\editors\Postprocess.exe"/>
7+
<OBJFILES value="..\..\..\intermediate\editors\PPEditor\\Postprocess.obj
8+
..\..\..\intermediate\editors\PPEditor\\main.obj
9+
..\..\..\intermediate\editors\PPEditor\\interp.obj
10+
..\..\..\intermediate\editors\PPEditor\\float_param.obj
11+
..\..\..\intermediate\editors\PPEditor\\float_constructor.obj
12+
..\..\..\intermediate\editors\PPEditor\\color.obj
13+
..\..\..\intermediate\editors\PPEditor\\single_param.obj
14+
..\..\..\intermediate\editors\PPEditor\\Envelope.obj
15+
..\..\..\intermediate\editors\PPEditor\\PostprocessAnimator.obj"/>
1316
<RESFILES value="Postprocess.res"/>
1417
<IDLFILES value=""/>
1518
<IDLGENFILES value=""/>
@@ -33,22 +36,22 @@
3336
<USERDEFINES value="_EDITOR;_PP_EDITOR_;ENGINE_API;IC;ICF;__forceinline"/>
3437
<SYSDEFINES value="NO_STRICT;USEPACKAGES"/>
3538
<MAINSOURCE value="Postprocess.cpp"/>
36-
<INCLUDEPATH value="..\..\xrGame;..\..\xrEngine;$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX"/>
37-
<LIBPATH value="..\..\..\SDK\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;x:\stalker_addon\libraries"/>
39+
<INCLUDEPATH value="..\..\xrGame;..\..\xrEngine;$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);..\..\..\sdk\components\AlexMX"/>
40+
<LIBPATH value="..\..\..\sdk\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;..\..\..\lib\editors"/>
3841
<WARNINGS value="-w-pck -w-par"/>
3942
<OTHERFILES value=""/>
4043
</MACROS>
4144
<OPTIONS>
4245
<IDLCFLAGS value="-I..\..\xrGame -I..\..\xrEngine -I$(BCB)\include -I$(BCB)\include\vcl
43-
-I$(CORE_DIR) -I$(COMPONENTS)\AlexMX -src_suffix cpp -D_EDITOR
46+
-I$(CORE_DIR) -I..\..\..\sdk\components\AlexMX -src_suffix cpp -D_EDITOR
4447
-D_PP_EDITOR_ -DENGINE_API -DIC -DICF -D__forceinline -boa"/>
4548
<CFLAG1 value="-O2 -H=x:\intermediate_ed\ppe\pch.csm -Hc -Q -Vmm -Vx -Ve -xf -xp -VF -X-
4649
-ps -a4 -6 -b- -k- -vi -c -tW -tWM"/>
47-
<PFLAGS value="-N2x:\intermediate_ed\ppe -N0x:\intermediate_ed\ppe -$Y- -$L- -$D- -$A8 -v
48-
-JPHNE -M"/>
50+
<PFLAGS value="-N2..\..\..\intermediate\editors\PPEditor
51+
-N0..\..\..\intermediate\editors\PPEditor -$Y- -$L- -$D- -$A8 -v -JPHNE -M"/>
4952
<RFLAGS value=""/>
5053
<AFLAGS value="/mx /w2 /zn"/>
51-
<LFLAGS value="-Ix:\intermediate_ed\ppe -D&quot;&quot; -aa -Tpe -x -Gn"/>
54+
<LFLAGS value="-I..\..\..\intermediate\editors\PPEditor -D&quot;&quot; -aa -Tpe -x -Gn"/>
5255
<OTHERFILES value=""/>
5356
</OPTIONS>
5457
<LINKER>
@@ -101,37 +104,36 @@ ProductName=
101104
ProductVersion=1.0.0.0
102105
Comments=
103106

104-
[Excluded Packages]
105-
e:\program files\borland\cbuilder6\Bin\bcb2kaxserver60.bpl=Borland C++Builder COM Server Components Sample Package
106-
107107
[HistoryLists\hlIncludePath]
108-
Count=13
109-
Item0=..\..\xrGame;..\..\xrEngine;$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX
110-
Item1=..\..\xrGame;..\..\xrEngine;$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX;$(3DA_DIR)
111-
Item2=$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX;$(3DA_DIR)
112-
Item3=$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX
113-
Item4=$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);X:\stalker_addon\sources\sdk\components\AlexMX
114-
Item5=$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR)
115-
Item6=..;$(BCB)\include;$(BCB)\include\vcl
116-
Item7=..\..\components\AlexMX;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl;e:\projects\xrcore
117-
Item8=..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl;e:\projects\xrcore
118-
Item9=..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl;Y:\postprocess\core_hdr;Y:\postprocess
119-
Item10=..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl;Y:\postprocess\core_hdr
120-
Item11=Y:\postprocess\core_hdr;..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl
121-
Item12=..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl
108+
Count=14
109+
Item0=..\..\xrGame;..\..\xrEngine;$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);..\..\..\sdk\components\AlexMX
110+
Item1=..\..\xrGame;..\..\xrEngine;$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX
111+
Item2=..\..\xrGame;..\..\xrEngine;$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX;$(3DA_DIR)
112+
Item3=$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX;$(3DA_DIR)
113+
Item4=$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);$(COMPONENTS)\AlexMX
114+
Item5=$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR);X:\stalker_addon\sources\sdk\components\AlexMX
115+
Item6=$(BCB)\include;$(BCB)\include\vcl;$(CORE_DIR)
116+
Item7=..;$(BCB)\include;$(BCB)\include\vcl
117+
Item8=..\..\components\AlexMX;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl;e:\projects\xrcore
118+
Item9=..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl;e:\projects\xrcore
119+
Item10=..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl;Y:\postprocess\core_hdr;Y:\postprocess
120+
Item11=..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl;Y:\postprocess\core_hdr
121+
Item12=Y:\postprocess\core_hdr;..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl
122+
Item13=..\RX\Units;..;Postprocess;$(BCB)\include;$(BCB)\include\vcl
122123

123124
[HistoryLists\hlLibraryPath]
124-
Count=10
125-
Item0=..\..\..\SDK\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;x:\stalker_addon\libraries
126-
Item1=..\..\..\SDK\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(COMPONENTS)\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;x:\stalker_addon\libraries
127-
Item2=$(COMPONENTS)\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;x:\stalker_addon\libraries
128-
Item3=..\..\..\SDK\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(COMPONENTS)\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
129-
Item4=$(COMPONENTS)\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
130-
Item5=..\..\..\sdk\components\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
131-
Item6=$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
132-
Item7=..\..\components\AlexMX;Y:\postprocess;..;Postprocess;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
133-
Item8=Y:\postprocess;..\RX\Units;..;Postprocess;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
134-
Item9=..\RX\Units;..;Postprocess;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
125+
Count=11
126+
Item0=..\..\..\sdk\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;..\..\..\lib\editors\
127+
Item1=..\..\..\SDK\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;x:\stalker_addon\libraries
128+
Item2=..\..\..\SDK\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(COMPONENTS)\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;x:\stalker_addon\libraries
129+
Item3=$(COMPONENTS)\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib;x:\stalker_addon\libraries
130+
Item4=..\..\..\SDK\components\AlexMX;..\..\xrGame;..\..\xrEngine;$(COMPONENTS)\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
131+
Item5=$(COMPONENTS)\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
132+
Item6=..\..\..\sdk\components\AlexMX;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
133+
Item7=$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
134+
Item8=..\..\components\AlexMX;Y:\postprocess;..;Postprocess;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
135+
Item9=Y:\postprocess;..\RX\Units;..;Postprocess;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
136+
Item10=..\RX\Units;..;Postprocess;$(BCB)\Projects\Lib;$(BCB)\lib\obj;$(BCB)\lib
135137

136138
[HistoryLists\hlDebugSourcePath]
137139
Count=1
@@ -162,15 +164,17 @@ Item19=_DEBUG,_EDITOR,_CPPUNWIND
162164
Item20=_DEBUG,__BORLANDC__
163165

164166
[HistoryLists\hlIntOutputDir]
165-
Count=1
166-
Item0=x:\intermediate_ed\ppe
167+
Count=2
168+
Item0=..\..\..\intermediate\editors\PPEditor\
169+
Item1=x:\intermediate_ed\ppe
167170

168171
[HistoryLists\hlFinalOutputDir]
169-
Count=4
170-
Item0=x:\stalker_addon\binaries\
171-
Item1=x:\binaries\
172-
Item2=x:\binaries
173-
Item3=x:\
172+
Count=5
173+
Item0=..\..\..\bin\editors\
174+
Item1=x:\stalker_addon\binaries\
175+
Item2=x:\binaries\
176+
Item3=x:\binaries
177+
Item4=x:\
174178

175179
[Debugging]
176180
DebugSourceDirs=$(BCB)\source\vcl

0 commit comments

Comments
 (0)