Skip to content

Commit 866f56d

Browse files
author
Ladislav Zezula
committed
+ Reverted include directories
1 parent 3c8cc59 commit 866f56d

33 files changed

+51
-1511
lines changed

‎CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
project(StormLib)
22
cmake_minimum_required(VERSION 2.6)
33

4-
include_directories(include)
5-
64
set(LIBRARY_NAME storm)
75

86
set(SRC_FILES

‎Makefile.linux

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ AR = ar
2424
DFLAGS = -D__SYS_ZLIB
2525
OFLAGS =
2626
LFLAGS = -lbz2 -lz
27-
CFLAGS = -fPIC -D_7ZIP_ST -Iinclude
27+
CFLAGS = -fPIC -D_7ZIP_ST
2828
CFLAGS += $(OFLAGS) $(DFLAGS)
2929

3030
OBJS = src/adpcm/adpcm.o \
@@ -292,6 +292,6 @@ all: $(LIB)
292292
install: $(LIB)
293293
install $(LIB) /usr/local/lib
294294
mkdir -p /usr/local/include/StormLib
295-
cp include/StormLib.h /usr/local/include/StormLib
296-
cp include/StormPort.h /usr/local/include/StormLib
295+
cp src/StormLib.h /usr/local/include/StormLib
296+
cp src/StormPort.h /usr/local/include/StormLib
297297
ldconfig

‎Makefile.mac

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
CPP = g++
1212
CC = gcc
13-
CFLAGS = -Wall -Iinclude
13+
CFLAGS = -Wall
1414
LFLAGS = -lbz2 -lz -framework Carbon
1515
ARCH = -arch x86_64
1616
DFLAGS = -D__SYS_BZLIB -D__SYS_ZLIB -D_7ZIP_ST
@@ -263,8 +263,8 @@ all: $(LIBRARY)
263263
#install: $(LIBRARY)
264264
# install $(LIBRARY) /usr/local/lib
265265
# mkdir -p /usr/local/include/StormLib
266-
# cp StormLib.h /usr/local/include/StormLib
267-
# cp StormPort.h /usr/local/include/StormLib
266+
# cp src/StormLib.h /usr/local/include/StormLib
267+
# cp src/StormPort.h /usr/local/include/StormLib
268268

269269
$(LIBRARY): $(COBJS) $(OBJS)
270270
$(CPP) $(CFLAGS) $(DFLAGS) $(ARCH) $(LFLAGS) -shared -o $(LIBRARY) $(COBJS) $(OBJS)

‎Premake5.lua

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ solution 'StormLib'
2323
'src/zlib/compress.c',
2424
}
2525

26-
includedirs { "include" }
27-
2826
filter 'configurations:Debug*'
2927
flags { 'Symbols' }
3028
defines { '_DEBUG' }

‎StormLib.bat

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ rem Example: StormLib.bat x64 Debug
55

66
if not exist ..\aaa goto exit
77

8-
copy include\StormPort.h ..\aaa\inc
9-
copy include\StormLib.h ..\aaa\inc
8+
copy src\StormPort.h ..\aaa\inc
9+
copy src\StormLib.h ..\aaa\inc
1010

1111
if x%1 == xWin32 goto PlatformWin32
1212
if x%1 == xx64 goto PlatformWin64
@@ -21,5 +21,3 @@ copy .\bin\StormLib\%1\%2\*.lib ..\aaa\lib64
2121
goto exit
2222

2323
:exit
24-
25-

‎StormLib_dll.vcproj

-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<Tool
4545
Name="VCCLCompilerTool"
4646
Optimization="0"
47-
AdditionalIncludeDirectories="include"
4847
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
4948
MinimalRebuild="true"
5049
BasicRuntimeChecks="3"
@@ -121,7 +120,6 @@
121120
<Tool
122121
Name="VCCLCompilerTool"
123122
Optimization="0"
124-
AdditionalIncludeDirectories="include"
125123
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
126124
MinimalRebuild="true"
127125
BasicRuntimeChecks="3"
@@ -197,7 +195,6 @@
197195
/>
198196
<Tool
199197
Name="VCCLCompilerTool"
200-
AdditionalIncludeDirectories="include"
201198
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
202199
RuntimeLibrary="0"
203200
UsePrecompiledHeader="0"
@@ -274,7 +271,6 @@
274271
/>
275272
<Tool
276273
Name="VCCLCompilerTool"
277-
AdditionalIncludeDirectories="include"
278274
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
279275
RuntimeLibrary="0"
280276
UsePrecompiledHeader="0"

‎StormLib_test.vcproj

-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<Tool
5151
Name="VCCLCompilerTool"
5252
Optimization="0"
53-
AdditionalIncludeDirectories="include"
5453
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__;__STORMLIB_DUMP_DATA__"
5554
MinimalRebuild="true"
5655
BasicRuntimeChecks="3"
@@ -130,7 +129,6 @@
130129
<Tool
131130
Name="VCCLCompilerTool"
132131
Optimization="0"
133-
AdditionalIncludeDirectories="include"
134132
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__STORMLIB_TEST__"
135133
MinimalRebuild="true"
136134
BasicRuntimeChecks="3"
@@ -208,7 +206,6 @@
208206
/>
209207
<Tool
210208
Name="VCCLCompilerTool"
211-
AdditionalIncludeDirectories="include"
212209
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__"
213210
RuntimeLibrary="0"
214211
UsePrecompiledHeader="0"
@@ -286,7 +283,6 @@
286283
/>
287284
<Tool
288285
Name="VCCLCompilerTool"
289-
AdditionalIncludeDirectories="include"
290286
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__STORMLIB_TEST__"
291287
RuntimeLibrary="0"
292288
UsePrecompiledHeader="0"

‎StormLib_vs08.vcproj

-16
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<Tool
4545
Name="VCCLCompilerTool"
4646
Optimization="0"
47-
AdditionalIncludeDirectories="include"
4847
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
4948
MinimalRebuild="false"
5049
BasicRuntimeChecks="3"
@@ -109,7 +108,6 @@
109108
<Tool
110109
Name="VCCLCompilerTool"
111110
Optimization="0"
112-
AdditionalIncludeDirectories="include"
113111
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
114112
MinimalRebuild="false"
115113
BasicRuntimeChecks="3"
@@ -173,7 +171,6 @@
173171
<Tool
174172
Name="VCCLCompilerTool"
175173
Optimization="0"
176-
AdditionalIncludeDirectories="include"
177174
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
178175
MinimalRebuild="false"
179176
BasicRuntimeChecks="3"
@@ -238,7 +235,6 @@
238235
<Tool
239236
Name="VCCLCompilerTool"
240237
Optimization="0"
241-
AdditionalIncludeDirectories="include"
242238
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
243239
MinimalRebuild="false"
244240
BasicRuntimeChecks="3"
@@ -303,7 +299,6 @@
303299
<Tool
304300
Name="VCCLCompilerTool"
305301
Optimization="2"
306-
AdditionalIncludeDirectories="include"
307302
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
308303
RuntimeLibrary="2"
309304
UsePrecompiledHeader="0"
@@ -367,7 +362,6 @@
367362
<Tool
368363
Name="VCCLCompilerTool"
369364
Optimization="2"
370-
AdditionalIncludeDirectories="include"
371365
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
372366
RuntimeLibrary="2"
373367
UsePrecompiledHeader="0"
@@ -430,7 +424,6 @@
430424
<Tool
431425
Name="VCCLCompilerTool"
432426
Optimization="2"
433-
AdditionalIncludeDirectories="include"
434427
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
435428
RuntimeLibrary="0"
436429
UsePrecompiledHeader="0"
@@ -494,7 +487,6 @@
494487
<Tool
495488
Name="VCCLCompilerTool"
496489
Optimization="2"
497-
AdditionalIncludeDirectories="include"
498490
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
499491
RuntimeLibrary="0"
500492
UsePrecompiledHeader="0"
@@ -556,7 +548,6 @@
556548
<Tool
557549
Name="VCCLCompilerTool"
558550
Optimization="0"
559-
AdditionalIncludeDirectories="include"
560551
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
561552
MinimalRebuild="false"
562553
BasicRuntimeChecks="3"
@@ -621,7 +612,6 @@
621612
<Tool
622613
Name="VCCLCompilerTool"
623614
Optimization="0"
624-
AdditionalIncludeDirectories="include"
625615
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
626616
MinimalRebuild="false"
627617
BasicRuntimeChecks="3"
@@ -685,7 +675,6 @@
685675
<Tool
686676
Name="VCCLCompilerTool"
687677
Optimization="0"
688-
AdditionalIncludeDirectories="include"
689678
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
690679
MinimalRebuild="false"
691680
BasicRuntimeChecks="3"
@@ -750,7 +739,6 @@
750739
<Tool
751740
Name="VCCLCompilerTool"
752741
Optimization="0"
753-
AdditionalIncludeDirectories="include"
754742
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
755743
MinimalRebuild="false"
756744
BasicRuntimeChecks="3"
@@ -815,7 +803,6 @@
815803
<Tool
816804
Name="VCCLCompilerTool"
817805
Optimization="2"
818-
AdditionalIncludeDirectories="include"
819806
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
820807
RuntimeLibrary="2"
821808
UsePrecompiledHeader="0"
@@ -879,7 +866,6 @@
879866
<Tool
880867
Name="VCCLCompilerTool"
881868
Optimization="2"
882-
AdditionalIncludeDirectories="include"
883869
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
884870
RuntimeLibrary="2"
885871
UsePrecompiledHeader="0"
@@ -942,7 +928,6 @@
942928
<Tool
943929
Name="VCCLCompilerTool"
944930
Optimization="2"
945-
AdditionalIncludeDirectories="include"
946931
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
947932
RuntimeLibrary="0"
948933
UsePrecompiledHeader="0"
@@ -1006,7 +991,6 @@
1006991
<Tool
1007992
Name="VCCLCompilerTool"
1008993
Optimization="2"
1009-
AdditionalIncludeDirectories="include"
1010994
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
1011995
RuntimeLibrary="0"
1012996
UsePrecompiledHeader="0"

‎StormLib_vs12.vcxproj

-16
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@
313313
<PrecompiledHeader />
314314
<WarningLevel>Level1</WarningLevel>
315315
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
316-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
317316
</ClCompile>
318317
<Lib>
319318
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -335,7 +334,6 @@
335334
<PrecompiledHeader />
336335
<WarningLevel>Level1</WarningLevel>
337336
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
338-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
339337
</ClCompile>
340338
<Lib>
341339
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -354,7 +352,6 @@
354352
<PrecompiledHeader />
355353
<WarningLevel>Level1</WarningLevel>
356354
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
357-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
358355
</ClCompile>
359356
<Lib>
360357
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -376,7 +373,6 @@
376373
<PrecompiledHeader />
377374
<WarningLevel>Level1</WarningLevel>
378375
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
379-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
380376
</ClCompile>
381377
<Lib>
382378
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -393,7 +389,6 @@
393389
<PrecompiledHeader />
394390
<WarningLevel>Level1</WarningLevel>
395391
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
396-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
397392
</ClCompile>
398393
<Lib>
399394
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -413,7 +408,6 @@
413408
<PrecompiledHeader />
414409
<WarningLevel>Level1</WarningLevel>
415410
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
416-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
417411
</ClCompile>
418412
<Lib>
419413
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -430,7 +424,6 @@
430424
<PrecompiledHeader />
431425
<WarningLevel>Level1</WarningLevel>
432426
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
433-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
434427
</ClCompile>
435428
<Lib>
436429
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -450,7 +443,6 @@
450443
<PrecompiledHeader />
451444
<WarningLevel>Level1</WarningLevel>
452445
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
453-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
454446
</ClCompile>
455447
<Lib>
456448
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -469,7 +461,6 @@
469461
<PrecompiledHeader />
470462
<WarningLevel>Level1</WarningLevel>
471463
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
472-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
473464
</ClCompile>
474465
<Lib>
475466
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -491,7 +482,6 @@
491482
<PrecompiledHeader />
492483
<WarningLevel>Level1</WarningLevel>
493484
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
494-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
495485
</ClCompile>
496486
<Lib>
497487
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -510,7 +500,6 @@
510500
<PrecompiledHeader />
511501
<WarningLevel>Level1</WarningLevel>
512502
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
513-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
514503
</ClCompile>
515504
<Lib>
516505
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -532,7 +521,6 @@
532521
<PrecompiledHeader />
533522
<WarningLevel>Level1</WarningLevel>
534523
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
535-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
536524
</ClCompile>
537525
<Lib>
538526
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -549,7 +537,6 @@
549537
<PrecompiledHeader />
550538
<WarningLevel>Level1</WarningLevel>
551539
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
552-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
553540
</ClCompile>
554541
<Lib>
555542
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -569,7 +556,6 @@
569556
<PrecompiledHeader />
570557
<WarningLevel>Level1</WarningLevel>
571558
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
572-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
573559
</ClCompile>
574560
<Lib>
575561
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -586,7 +572,6 @@
586572
<PrecompiledHeader />
587573
<WarningLevel>Level1</WarningLevel>
588574
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
589-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
590575
</ClCompile>
591576
<Lib>
592577
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>
@@ -606,7 +591,6 @@
606591
<PrecompiledHeader />
607592
<WarningLevel>Level1</WarningLevel>
608593
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
609-
<AdditionalIncludeDirectories>include</AdditionalIncludeDirectories>
610594
</ClCompile>
611595
<Lib>
612596
<OutputFile>./bin/$(ProjectName)/$(Platform)/$(Configuration)/$(TargetName).lib</OutputFile>

0 commit comments

Comments
 (0)