Skip to content

Commit 7520c49

Browse files
committedFeb 18, 2014
Replace Find_file with the Boost filesystem library.
1 parent 83c8848 commit 7520c49

15 files changed

+566
-266
lines changed
 

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
/Makefile.in
66
/aclocal.m4
77
/autom4te.cache/
8+
/compile
9+
/config.guess
810
/config.log
911
/config.status
12+
/config.sub
1013
/configure
1114
/depcomp
1215
/dumpwad

‎Makefile.am

+5-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ CLEANFILES = quadra.res $(EXTRA_PROGRAMS)
1313

1414
AM_CPPFLAGS = \
1515
-I$(srcdir)/include -I$(srcdir)/skelton/include -I$(srcdir)/images \
16-
-DDATAGAMESDIR='"$(datagamesdir)"' $(SDL2_CFLAGS)
16+
-DDATAGAMESDIR='"$(datagamesdir)"' $(SDL2_CFLAGS) $(BOOST_CPPFLAGS)
17+
18+
AM_LDFLAGS = $(BOOST_LDFLAGS)
1719

1820
EXTRA_DIST = \
1921
ChangeLog \
@@ -40,8 +42,7 @@ EXTRA_DIST = \
4042
stats \
4143
textes
4244

43-
quadra_LDFLAGS = $(AM_LDFLAGS)
44-
quadra_LDADD = $(SDL2_LIBS)
45+
quadra_LDADD = $(SDL2_LIBS) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB)
4546
quadra_SOURCES = \
4647
images/quadra.xpm \
4748
include/bloc.h \
@@ -116,7 +117,6 @@ quadra_SOURCES = \
116117
skelton/include/cursor.h \
117118
skelton/include/dict.h \
118119
skelton/include/error.h \
119-
skelton/include/find_file.h \
120120
skelton/include/http_post.h \
121121
skelton/include/http_request.h \
122122
skelton/include/id.h \
@@ -148,7 +148,6 @@ quadra_SOURCES = \
148148
skelton/include/video_dumb.h \
149149
skelton/include/zone_text_clock.h \
150150
skelton/svgalib/error.cpp \
151-
skelton/svgalib/find_file.cpp \
152151
skelton/svgalib/input.cpp \
153152
skelton/svgalib/main.cpp \
154153
skelton/svgalib/palette.cpp \
@@ -187,7 +186,7 @@ quadra_SOURCES = \
187186
source/zone_list.cpp
188187

189188
# FIXME: we use SDL_Log in wadder, should avoid.
190-
wadder_LDADD = $(SDL2_LIBS)
189+
wadder_LDADD = $(SDL2_LIBS) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB)
191190
wadder_SOURCES = \
192191
skelton/common/resfile.cpp \
193192
skelton/common/resmanager.cpp \

‎VisualC++/Skelton.vcproj

-26
Original file line numberDiff line numberDiff line change
@@ -393,28 +393,6 @@
393393
/>
394394
</FileConfiguration>
395395
</File>
396-
<File
397-
RelativePath="..\skelton\directx\find_file.cpp"
398-
>
399-
<FileConfiguration
400-
Name="Debug|Win32"
401-
>
402-
<Tool
403-
Name="VCCLCompilerTool"
404-
AdditionalIncludeDirectories=""
405-
PreprocessorDefinitions=""
406-
/>
407-
</FileConfiguration>
408-
<FileConfiguration
409-
Name="Release|Win32"
410-
>
411-
<Tool
412-
Name="VCCLCompilerTool"
413-
AdditionalIncludeDirectories=""
414-
PreprocessorDefinitions=""
415-
/>
416-
</FileConfiguration>
417-
</File>
418396
<File
419397
RelativePath="..\skelton\common\http_post.cpp"
420398
>
@@ -1154,10 +1132,6 @@
11541132
RelativePath="..\skelton\include\error.h"
11551133
>
11561134
</File>
1157-
<File
1158-
RelativePath="..\skelton\include\find_file.h"
1159-
>
1160-
</File>
11611135
<File
11621136
RelativePath="..\skelton\include\http_post.h"
11631137
>

‎VisualC++/quadra2003.vcproj

-6
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@
169169
<File
170170
RelativePath="..\skelton\directx\error.cpp">
171171
</File>
172-
<File
173-
RelativePath="..\skelton\directx\find_file.cpp">
174-
</File>
175172
<File
176173
RelativePath="..\source\fonts.cpp">
177174
</File>
@@ -399,9 +396,6 @@
399396
<File
400397
RelativePath="..\skelton\include\error.h">
401398
</File>
402-
<File
403-
RelativePath="..\skelton\include\find_file.h">
404-
</File>
405399
<File
406400
RelativePath="..\include\fonts.h">
407401
</File>

‎VisualC++/quadra2012.vcxproj

-2
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
<ClCompile Include="..\skelton\common\cursor_self.cpp" />
124124
<ClCompile Include="..\skelton\common\dict.cpp" />
125125
<ClCompile Include="..\skelton\directx\error.cpp" />
126-
<ClCompile Include="..\skelton\directx\find_file.cpp" />
127126
<ClCompile Include="..\source\fonts.cpp" />
128127
<ClCompile Include="..\source\game.cpp" />
129128
<ClCompile Include="..\source\game_menu.cpp" />
@@ -200,7 +199,6 @@
200199
<ClInclude Include="..\skelton\include\cursor_x11.h" />
201200
<ClInclude Include="..\skelton\include\dict.h" />
202201
<ClInclude Include="..\skelton\include\error.h" />
203-
<ClInclude Include="..\skelton\include\find_file.h" />
204202
<ClInclude Include="..\include\fonts.h" />
205203
<ClInclude Include="..\include\game.h" />
206204
<ClInclude Include="..\include\game_menu.h" />

‎VisualC++/wadder2003.vcproj

-6
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@
148148
<File
149149
RelativePath="..\skelton\directx\error.cpp">
150150
</File>
151-
<File
152-
RelativePath="..\skelton\directx\find_file.cpp">
153-
</File>
154151
<File
155152
RelativePath="..\skelton\common\http_post.cpp">
156153
</File>
@@ -288,9 +285,6 @@
288285
<File
289286
RelativePath="..\skelton\include\error.h">
290287
</File>
291-
<File
292-
RelativePath="..\skelton\include\find_file.h">
293-
</File>
294288
<File
295289
RelativePath="..\skelton\include\http_post.h">
296290
</File>

‎VisualC++/wadder2012.vcxproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
<ClCompile Include="..\skelton\common\cursor_self.cpp" />
114114
<ClCompile Include="..\skelton\common\dict.cpp" />
115115
<ClCompile Include="..\skelton\directx\error.cpp" />
116-
<ClCompile Include="..\skelton\directx\find_file.cpp" />
117116
<ClCompile Include="..\skelton\common\http_post.cpp" />
118117
<ClCompile Include="..\skelton\common\http_request.cpp" />
119118
<ClCompile Include="..\skelton\common\id.cpp" />
@@ -160,7 +159,6 @@
160159
<ClInclude Include="..\skelton\include\cursor_x11.h" />
161160
<ClInclude Include="..\skelton\include\dict.h" />
162161
<ClInclude Include="..\skelton\include\error.h" />
163-
<ClInclude Include="..\skelton\include\find_file.h" />
164162
<ClInclude Include="..\skelton\include\http_post.h" />
165163
<ClInclude Include="..\skelton\include\http_request.h" />
166164
<ClInclude Include="..\skelton\include\id.h" />
@@ -212,4 +210,4 @@
212210
<Import Project="packages\libpng.redist.1.5.10.11\build\native\libpng.redist.targets" Condition="Exists('packages\libpng.redist.1.5.10.11\build\native\libpng.redist.targets')" />
213211
<Import Project="packages\libpng.1.5.10.11\build\native\libpng.targets" Condition="Exists('packages\libpng.1.5.10.11\build\native\libpng.targets')" />
214212
</ImportGroup>
215-
</Project>
213+
</Project>

‎configure.ac

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ AC_PROG_SED
1919

2020
# Checks for libraries.
2121
AX_PATH_GENERIC([sdl2],,,, AC_MSG_ERROR([Could not find SDL2 (required).]))
22+
AX_BOOST_BASE(,, AC_MSG_ERROR([Could not find Boost (required).]))
23+
AX_BOOST_SYSTEM
24+
AX_BOOST_FILESYSTEM
2225

2326
# Checks for header files.
2427
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h memory.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h unistd.h machine/endian.h machine/byte_order.h])

0 commit comments

Comments
 (0)
Please sign in to comment.