Permalink
Browse files

-Fix: fix handling of #if DOS in source.list

  • Loading branch information...
miniupnp committed Jan 3, 2018
1 parent 119e34a commit c6eff46706029703677640df6418c19573224e23
View
@@ -100,6 +100,7 @@ AWKCOMMAND='
if ($0 == "PULSE" && "'$with_pulse'" == "0") { next; }
if ($0 == "OSX" && "'$os'" != "OSX") { next; }
if ($0 == "TOS" && "'$os'" != "TOS") { next; }
if ($0 == "DOS" && "'$os'" != "DOS") { next; }
if ($0 == "WIN32" && "'$os'" != "MINGW" &&
"'$os'" != "CYGWIN" && "'$os'" != "MSVC") { next; }
View
@@ -18,7 +18,7 @@ generate_data()
{
RES="`LC_COLLATE=C ls -Rp "$ROOT_DIR/$1" | awk -v source="$3" -v counter="$counter" '
BEGIN {
path = "";
path = "'$1'";
previous = ":";
deep = 0;
skip = 0;
@@ -183,6 +183,7 @@ generate() {
# Everything above the !!FILES!! marker
cat "$ROOT_DIR/projects/$2.in" | tr '\r' '\n' | awk '
/^$/ { next }
/!!CPPDEFS!!/ { next }
/!!FILES!!/ { stop = 1; }
{
if (stop == 0) { print $0 }
View
@@ -152,6 +152,8 @@ Function load_main_data(sourcelist_file, ByRef vcxproj, ByRef filters, ByRef fil
(line = "PULSE" And sound_config = "PULSE") Or _
(line = "ALSA" And sound_config = "ALSA") Or _
(line = "WIN32" And (os = "MSVC" Or os = "MINGW" Or os = "CYGWIN") ) Or _
(line = "TOS" And os = "TOS") _
(line = "DOS" And os = "DOS") _
(line = "OSX" And os = "OSX") _
) Then
skip = skip + 1
@@ -503,6 +503,10 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\src\video\video_dos.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\src\video\video_fps.c">
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
@@ -582,6 +582,9 @@
<ClCompile Include="..\src\video\video_atari.c">
<Filter>src\video</Filter>
</ClCompile>
<ClCompile Include="..\src\video\video_dos.c">
<Filter>src\video</Filter>
</ClCompile>
<ClCompile Include="..\src\video\video_fps.c">
<Filter>src\video</Filter>
</ClCompile>
@@ -514,6 +514,10 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\src\video\video_dos.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\src\video\video_fps.c">
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
@@ -582,6 +582,9 @@
<ClCompile Include="..\src\video\video_atari.c">
<Filter>src\video</Filter>
</ClCompile>
<ClCompile Include="..\src\video\video_dos.c">
<Filter>src\video</Filter>
</ClCompile>
<ClCompile Include="..\src\video\video_fps.c">
<Filter>src\video</Filter>
</ClCompile>
@@ -514,6 +514,10 @@
<ExcludedFromBuild>true</ExcludedFromBuild>
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\src\video\video_dos.c">
<ExcludedFromBuild>true</ExcludedFromBuild>
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
<ClCompile Include="..\src\video\video_fps.c">
<ObjectFileName>$(IntDir)src\video\</ObjectFileName>
</ClCompile>
@@ -582,6 +582,9 @@
<ClCompile Include="..\src\video\video_atari.c">
<Filter>src\video</Filter>
</ClCompile>
<ClCompile Include="..\src\video\video_dos.c">
<Filter>src\video</Filter>
</ClCompile>
<ClCompile Include="..\src\video\video_fps.c">
<Filter>src\video</Filter>
</ClCompile>

0 comments on commit c6eff46

Please sign in to comment.