From f2289c40acb4e7231ba967e60532aa8c18b4ce35 Mon Sep 17 00:00:00 2001 From: Scott Ludwig Date: Thu, 21 Jan 2016 19:06:42 -0800 Subject: [PATCH] Make data assets buildable on Linux - Buildable on OSX and Linux now - Fixed filename casing mismatches - Inicrunch fixes, osx and linux versions, added Makefile Note: gnu's cpp doesn't understand the -Wno-invalid-pp-token flag, the absence of which causes ignorable preprocessing warnings on strings with unmatched quotes. --- bin/inicrunch_linux | Bin 0 -> 18602 bytes bin/{inicrunch => inicrunch_osx} | Bin .../{placementBad.bmp => placementbad.bmp} | Bin .../{placementGood.bmp => placementgood.bmp} | Bin ...{RocketArtifact.bmp => rocketartifact.bmp} | Bin data/art824/{HQ.amx => hq.amx} | 24 ++++++------ data/art824/{HQ => hq}/hq_a_0_0.png | Bin data/art824/{HQ => hq}/hq_a_0_1.png | Bin data/art824/{HQ => hq}/hq_a_0_2.png | Bin data/art824/{HQ => hq}/hq_a_0_3.png | Bin data/art824/{HQ => hq}/hq_a_0_4.png | Bin .../{HQ/Hq_a_1_0.png => hq/hq_a_1_0.png} | Bin data/art824/{HQ => hq}/hq_a_1_1.png | Bin data/art824/{HQ => hq}/hq_a_1_2.png | Bin data/art824/{HQ => hq}/hq_a_1_3.png | Bin data/art824/{HQ => hq}/hq_a_1_4.png | Bin .../{HQ/Hq_a_2_0.png => hq/hq_a_2_0.png} | Bin data/art824/{HQ => hq}/icon.png | Bin data/art824/ltank.amx | 14 +++---- data/art824/mobilehq.amx | 4 +- data/art824/{Radar.amx => radar.amx} | 20 +++++----- data/art824/replicator.amx | 36 +++++++++--------- ...ightsA_01.png => replicatorlightsa_01.png} | Bin ...ightsA_02.png => replicatorlightsa_02.png} | Bin ...ightsA_03.png => replicatorlightsa_03.png} | Bin ...ightsA_04.png => replicatorlightsa_04.png} | Bin ...ightsA_05.png => replicatorlightsa_05.png} | Bin ...ightsB_01.png => replicatorlightsb_01.png} | Bin ...ightsB_02.png => replicatorlightsb_02.png} | Bin ...ightsB_03.png => replicatorlightsb_03.png} | Bin ...ightsB_04.png => replicatorlightsb_04.png} | Bin ...ightsB_05.png => replicatorlightsb_05.png} | Bin ...licatorOff_01.png => replicatoroff_01.png} | Bin ...licatorOff_02.png => replicatoroff_02.png} | Bin ...licatorOff_03.png => replicatoroff_03.png} | Bin ...licatorOff_04.png => replicatoroff_04.png} | Bin ...eplicatorOn_01.png => replicatoron_01.png} | Bin ...eplicatorOn_02.png => replicatoron_02.png} | Bin ...eplicatorOn_03.png => replicatoron_03.png} | Bin ...eplicatorOn_04.png => replicatoron_04.png} | Bin data/art824/{Research.amx => research.amx} | 14 +++---- data/art824/{VTS.amx => vts.amx} | 14 +++---- ...arehouse_a_2_2.PNG => warehouse_a_2_2.png} | Bin data/makefile | 23 ++++++----- inicrunch/Makefile | 16 ++++++++ inicrunch/ini.cpp | 2 +- inicrunch/ini.h | 5 ++- inicrunch/make.sh | 1 - 48 files changed, 97 insertions(+), 76 deletions(-) create mode 100755 bin/inicrunch_linux rename bin/{inicrunch => inicrunch_osx} (100%) rename data/art824/bitmaps/{placementBad.bmp => placementbad.bmp} (100%) rename data/art824/bitmaps/{placementGood.bmp => placementgood.bmp} (100%) rename data/art824/bitmaps/{RocketArtifact.bmp => rocketartifact.bmp} (100%) rename data/art824/{HQ.amx => hq.amx} (96%) rename data/art824/{HQ => hq}/hq_a_0_0.png (100%) rename data/art824/{HQ => hq}/hq_a_0_1.png (100%) rename data/art824/{HQ => hq}/hq_a_0_2.png (100%) rename data/art824/{HQ => hq}/hq_a_0_3.png (100%) rename data/art824/{HQ => hq}/hq_a_0_4.png (100%) rename data/art824/{HQ/Hq_a_1_0.png => hq/hq_a_1_0.png} (100%) rename data/art824/{HQ => hq}/hq_a_1_1.png (100%) rename data/art824/{HQ => hq}/hq_a_1_2.png (100%) rename data/art824/{HQ => hq}/hq_a_1_3.png (100%) rename data/art824/{HQ => hq}/hq_a_1_4.png (100%) rename data/art824/{HQ/Hq_a_2_0.png => hq/hq_a_2_0.png} (100%) rename data/art824/{HQ => hq}/icon.png (100%) rename data/art824/{Radar.amx => radar.amx} (95%) rename data/art824/replicator/{replicatorLightsA_01.png => replicatorlightsa_01.png} (100%) rename data/art824/replicator/{replicatorLightsA_02.png => replicatorlightsa_02.png} (100%) rename data/art824/replicator/{replicatorLightsA_03.png => replicatorlightsa_03.png} (100%) rename data/art824/replicator/{replicatorLightsA_04.png => replicatorlightsa_04.png} (100%) rename data/art824/replicator/{replicatorLightsA_05.png => replicatorlightsa_05.png} (100%) rename data/art824/replicator/{replicatorLightsB_01.png => replicatorlightsb_01.png} (100%) rename data/art824/replicator/{replicatorLightsB_02.png => replicatorlightsb_02.png} (100%) rename data/art824/replicator/{replicatorLightsB_03.png => replicatorlightsb_03.png} (100%) rename data/art824/replicator/{replicatorLightsB_04.png => replicatorlightsb_04.png} (100%) rename data/art824/replicator/{replicatorLightsB_05.png => replicatorlightsb_05.png} (100%) rename data/art824/replicator/{replicatorOff_01.png => replicatoroff_01.png} (100%) rename data/art824/replicator/{replicatorOff_02.png => replicatoroff_02.png} (100%) rename data/art824/replicator/{replicatorOff_03.png => replicatoroff_03.png} (100%) rename data/art824/replicator/{replicatorOff_04.png => replicatoroff_04.png} (100%) rename data/art824/replicator/{replicatorOn_01.png => replicatoron_01.png} (100%) rename data/art824/replicator/{replicatorOn_02.png => replicatoron_02.png} (100%) rename data/art824/replicator/{replicatorOn_03.png => replicatoron_03.png} (100%) rename data/art824/replicator/{replicatorOn_04.png => replicatoron_04.png} (100%) rename data/art824/{Research.amx => research.amx} (96%) rename data/art824/{VTS.amx => vts.amx} (96%) rename data/art824/warehouse/{warehouse_a_2_2.PNG => warehouse_a_2_2.png} (100%) create mode 100644 inicrunch/Makefile delete mode 100755 inicrunch/make.sh diff --git a/bin/inicrunch_linux b/bin/inicrunch_linux new file mode 100755 index 0000000000000000000000000000000000000000..5c9a812c4e29806a733427dd11d5ec7908732ebd GIT binary patch literal 18602 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 literal 0 HcmV?d00001 diff --git a/bin/inicrunch b/bin/inicrunch_osx similarity index 100% rename from bin/inicrunch rename to bin/inicrunch_osx diff --git a/data/art824/bitmaps/placementBad.bmp b/data/art824/bitmaps/placementbad.bmp similarity index 100% rename from data/art824/bitmaps/placementBad.bmp rename to data/art824/bitmaps/placementbad.bmp diff --git a/data/art824/bitmaps/placementGood.bmp b/data/art824/bitmaps/placementgood.bmp similarity index 100% rename from data/art824/bitmaps/placementGood.bmp rename to data/art824/bitmaps/placementgood.bmp diff --git a/data/art824/bitmaps/RocketArtifact.bmp b/data/art824/bitmaps/rocketartifact.bmp similarity index 100% rename from data/art824/bitmaps/RocketArtifact.bmp rename to data/art824/bitmaps/rocketartifact.bmp diff --git a/data/art824/HQ.amx b/data/art824/hq.amx similarity index 96% rename from data/art824/HQ.amx rename to data/art824/hq.amx index 81572f1..2d1770b 100644 --- a/data/art824/HQ.amx +++ b/data/art824/hq.amx @@ -28,40 +28,40 @@ <_x0034_ href="#ref-21"/> -HQ\hq_a_0_0.png +hq\hq_a_0_0.png -HQ\hq_a_0_1.png +hq\hq_a_0_1.png -HQ\hq_a_0_2.png +hq\hq_a_0_2.png -HQ\hq_a_0_3.png +hq\hq_a_0_3.png -HQ\Hq_a_1_0.png +hq\hq_a_1_0.png -HQ\hq_a_1_1.png +hq\hq_a_1_1.png -HQ\hq_a_1_2.png +hq\hq_a_1_2.png -HQ\hq_a_1_3.png +hq\hq_a_1_3.png -HQ\Hq_a_2_0.png +hq\hq_a_2_0.png -HQ\hq_a_0_4.png +hq\hq_a_0_4.png -HQ\hq_a_1_4.png +hq\hq_a_1_4.png -HQ\icon.png +hq\icon.png a 0 diff --git a/data/art824/HQ/hq_a_0_0.png b/data/art824/hq/hq_a_0_0.png similarity index 100% rename from data/art824/HQ/hq_a_0_0.png rename to data/art824/hq/hq_a_0_0.png diff --git a/data/art824/HQ/hq_a_0_1.png b/data/art824/hq/hq_a_0_1.png similarity index 100% rename from data/art824/HQ/hq_a_0_1.png rename to data/art824/hq/hq_a_0_1.png diff --git a/data/art824/HQ/hq_a_0_2.png b/data/art824/hq/hq_a_0_2.png similarity index 100% rename from data/art824/HQ/hq_a_0_2.png rename to data/art824/hq/hq_a_0_2.png diff --git a/data/art824/HQ/hq_a_0_3.png b/data/art824/hq/hq_a_0_3.png similarity index 100% rename from data/art824/HQ/hq_a_0_3.png rename to data/art824/hq/hq_a_0_3.png diff --git a/data/art824/HQ/hq_a_0_4.png b/data/art824/hq/hq_a_0_4.png similarity index 100% rename from data/art824/HQ/hq_a_0_4.png rename to data/art824/hq/hq_a_0_4.png diff --git a/data/art824/HQ/Hq_a_1_0.png b/data/art824/hq/hq_a_1_0.png similarity index 100% rename from data/art824/HQ/Hq_a_1_0.png rename to data/art824/hq/hq_a_1_0.png diff --git a/data/art824/HQ/hq_a_1_1.png b/data/art824/hq/hq_a_1_1.png similarity index 100% rename from data/art824/HQ/hq_a_1_1.png rename to data/art824/hq/hq_a_1_1.png diff --git a/data/art824/HQ/hq_a_1_2.png b/data/art824/hq/hq_a_1_2.png similarity index 100% rename from data/art824/HQ/hq_a_1_2.png rename to data/art824/hq/hq_a_1_2.png diff --git a/data/art824/HQ/hq_a_1_3.png b/data/art824/hq/hq_a_1_3.png similarity index 100% rename from data/art824/HQ/hq_a_1_3.png rename to data/art824/hq/hq_a_1_3.png diff --git a/data/art824/HQ/hq_a_1_4.png b/data/art824/hq/hq_a_1_4.png similarity index 100% rename from data/art824/HQ/hq_a_1_4.png rename to data/art824/hq/hq_a_1_4.png diff --git a/data/art824/HQ/Hq_a_2_0.png b/data/art824/hq/hq_a_2_0.png similarity index 100% rename from data/art824/HQ/Hq_a_2_0.png rename to data/art824/hq/hq_a_2_0.png diff --git a/data/art824/HQ/icon.png b/data/art824/hq/icon.png similarity index 100% rename from data/art824/HQ/icon.png rename to data/art824/hq/icon.png diff --git a/data/art824/ltank.amx b/data/art824/ltank.amx index 628ac28..2d06154 100644 --- a/data/art824/ltank.amx +++ b/data/art824/ltank.amx @@ -96,25 +96,25 @@ ltank\ltank_base_7_0.png -ltank\ltank_base_1_0.PNG +ltank\ltank_base_1_0.png -ltank\ltank_base_2_0.PNG +ltank\ltank_base_2_0.png -ltank\ltank_base_3_0.PNG +ltank\ltank_base_3_0.png -ltank\ltank_base_4_0.PNG +ltank\ltank_base_4_0.png -ltank\ltank_base_5_0.PNG +ltank\ltank_base_5_0.png -ltank\ltank_base_6_0.PNG +ltank\ltank_base_6_0.png -ltank\ltank_base_0_0.PNG +ltank\ltank_base_0_0.png ltank\ltank_fire_15_2.png diff --git a/data/art824/mobilehq.amx b/data/art824/mobilehq.amx index 045b4e2..d4a8ca3 100644 --- a/data/art824/mobilehq.amx +++ b/data/art824/mobilehq.amx @@ -29,7 +29,7 @@ <_x0039_ href="#ref-22"/> -mobilehq\mobilehq_run_0_0.PNG +mobilehq\mobilehq_run_0_0.png mobilehq\mobilehq_run_2_0.png @@ -50,7 +50,7 @@ mobilehq\mobilehq_run_7_0.png -mobilehq\mobilehq_run_1_0.PNG +mobilehq\mobilehq_run_1_0.png run 0 diff --git a/data/art824/Radar.amx b/data/art824/radar.amx similarity index 95% rename from data/art824/Radar.amx rename to data/art824/radar.amx index a3a7634..240f5c8 100644 --- a/data/art824/Radar.amx +++ b/data/art824/radar.amx @@ -26,34 +26,34 @@ <_x0034_ href="#ref-19"/> -Radar\radar_a_0_3.png +radar\radar_a_0_3.png -Radar\radar_a_0_1.png +radar\radar_a_0_1.png -Radar\radar_a_0_2.png +radar\radar_a_0_2.png -Radar\radar_a_0_0.png +radar\radar_a_0_0.png -Radar\radar_a_1_3.png +radar\radar_a_1_3.png -Radar\radar_a_1_1.png +radar\radar_a_1_1.png -Radar\radar_a_1_2.png +radar\radar_a_1_2.png -Radar\radar_a_1_0.png +radar\radar_a_1_0.png -Radar\radar_a_2_0.png +radar\radar_a_2_0.png -Radar\icon.png +radar\icon.png a 0 diff --git a/data/art824/replicator.amx b/data/art824/replicator.amx index 5f56b7b..48b44ef 100644 --- a/data/art824/replicator.amx +++ b/data/art824/replicator.amx @@ -40,58 +40,58 @@ replicator\icon.png -replicator\replicatorOn_04.png +replicator\replicatoron_04.png -replicator\replicatorOff_01.png +replicator\replicatoroff_01.png -replicator\replicatorOff_02.png +replicator\replicatoroff_02.png -replicator\replicatorOff_03.png +replicator\replicatoroff_03.png -replicator\replicatorOff_04.png +replicator\replicatoroff_04.png -replicator\replicatorOn_01.png +replicator\replicatoron_01.png -replicator\replicatorOn_02.png +replicator\replicatoron_02.png -replicator\replicatorOn_03.png +replicator\replicatoron_03.png -replicator\replicatorLightsA_01.png +replicator\replicatorlightsa_01.png -replicator\replicatorLightsB_01.png +replicator\replicatorlightsb_01.png -replicator\replicatorLightsB_05.png +replicator\replicatorlightsb_05.png -replicator\replicatorLightsA_02.png +replicator\replicatorlightsa_02.png -replicator\replicatorLightsA_03.png +replicator\replicatorlightsa_03.png -replicator\replicatorLightsA_04.png +replicator\replicatorlightsa_04.png -replicator\replicatorLightsA_05.png +replicator\replicatorlightsa_05.png -replicator\replicatorLightsB_02.png +replicator\replicatorlightsb_02.png -replicator\replicatorLightsB_03.png +replicator\replicatorlightsb_03.png -replicator\replicatorLightsB_04.png +replicator\replicatorlightsb_04.png a 0a diff --git a/data/art824/replicator/replicatorLightsA_01.png b/data/art824/replicator/replicatorlightsa_01.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_01.png rename to data/art824/replicator/replicatorlightsa_01.png diff --git a/data/art824/replicator/replicatorLightsA_02.png b/data/art824/replicator/replicatorlightsa_02.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_02.png rename to data/art824/replicator/replicatorlightsa_02.png diff --git a/data/art824/replicator/replicatorLightsA_03.png b/data/art824/replicator/replicatorlightsa_03.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_03.png rename to data/art824/replicator/replicatorlightsa_03.png diff --git a/data/art824/replicator/replicatorLightsA_04.png b/data/art824/replicator/replicatorlightsa_04.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_04.png rename to data/art824/replicator/replicatorlightsa_04.png diff --git a/data/art824/replicator/replicatorLightsA_05.png b/data/art824/replicator/replicatorlightsa_05.png similarity index 100% rename from data/art824/replicator/replicatorLightsA_05.png rename to data/art824/replicator/replicatorlightsa_05.png diff --git a/data/art824/replicator/replicatorLightsB_01.png b/data/art824/replicator/replicatorlightsb_01.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_01.png rename to data/art824/replicator/replicatorlightsb_01.png diff --git a/data/art824/replicator/replicatorLightsB_02.png b/data/art824/replicator/replicatorlightsb_02.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_02.png rename to data/art824/replicator/replicatorlightsb_02.png diff --git a/data/art824/replicator/replicatorLightsB_03.png b/data/art824/replicator/replicatorlightsb_03.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_03.png rename to data/art824/replicator/replicatorlightsb_03.png diff --git a/data/art824/replicator/replicatorLightsB_04.png b/data/art824/replicator/replicatorlightsb_04.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_04.png rename to data/art824/replicator/replicatorlightsb_04.png diff --git a/data/art824/replicator/replicatorLightsB_05.png b/data/art824/replicator/replicatorlightsb_05.png similarity index 100% rename from data/art824/replicator/replicatorLightsB_05.png rename to data/art824/replicator/replicatorlightsb_05.png diff --git a/data/art824/replicator/replicatorOff_01.png b/data/art824/replicator/replicatoroff_01.png similarity index 100% rename from data/art824/replicator/replicatorOff_01.png rename to data/art824/replicator/replicatoroff_01.png diff --git a/data/art824/replicator/replicatorOff_02.png b/data/art824/replicator/replicatoroff_02.png similarity index 100% rename from data/art824/replicator/replicatorOff_02.png rename to data/art824/replicator/replicatoroff_02.png diff --git a/data/art824/replicator/replicatorOff_03.png b/data/art824/replicator/replicatoroff_03.png similarity index 100% rename from data/art824/replicator/replicatorOff_03.png rename to data/art824/replicator/replicatoroff_03.png diff --git a/data/art824/replicator/replicatorOff_04.png b/data/art824/replicator/replicatoroff_04.png similarity index 100% rename from data/art824/replicator/replicatorOff_04.png rename to data/art824/replicator/replicatoroff_04.png diff --git a/data/art824/replicator/replicatorOn_01.png b/data/art824/replicator/replicatoron_01.png similarity index 100% rename from data/art824/replicator/replicatorOn_01.png rename to data/art824/replicator/replicatoron_01.png diff --git a/data/art824/replicator/replicatorOn_02.png b/data/art824/replicator/replicatoron_02.png similarity index 100% rename from data/art824/replicator/replicatorOn_02.png rename to data/art824/replicator/replicatoron_02.png diff --git a/data/art824/replicator/replicatorOn_03.png b/data/art824/replicator/replicatoron_03.png similarity index 100% rename from data/art824/replicator/replicatorOn_03.png rename to data/art824/replicator/replicatoron_03.png diff --git a/data/art824/replicator/replicatorOn_04.png b/data/art824/replicator/replicatoron_04.png similarity index 100% rename from data/art824/replicator/replicatorOn_04.png rename to data/art824/replicator/replicatoron_04.png diff --git a/data/art824/Research.amx b/data/art824/research.amx similarity index 96% rename from data/art824/Research.amx rename to data/art824/research.amx index 9f41637..64cef6b 100644 --- a/data/art824/Research.amx +++ b/data/art824/research.amx @@ -23,25 +23,25 @@ <_x0034_ href="#ref-16"/> -Research\research_a_0_0.png +research\research_a_0_0.png -Research\research_dish_0_2.png +research\research_dish_0_2.png -Research\research_dish_0_1.png +research\research_dish_0_1.png -Research\research_dish_0_0.png +research\research_dish_0_0.png -Research\research_a_2_0.png +research\research_a_2_0.png -Research\research_a_1_0.png +research\research_a_1_0.png -Research\icon.png +research\icon.png a 0 diff --git a/data/art824/VTS.amx b/data/art824/vts.amx similarity index 96% rename from data/art824/VTS.amx rename to data/art824/vts.amx index eb8fc68..d6f5013 100644 --- a/data/art824/VTS.amx +++ b/data/art824/vts.amx @@ -26,25 +26,25 @@ <_x0037_ href="#ref-19"/> -VTS\vts_b_0_0.png +vts\vts_b_0_0.png -VTS\vts_b_1_0.png +vts\vts_b_1_0.png -VTS\vts_b_2_0.png +vts\vts_b_2_0.png -VTS\vts_a_2_0.png +vts\vts_a_2_0.png -VTS\vts_a_1_0.png +vts\vts_a_1_0.png -VTS\vts_a_0_0.png +vts\vts_a_0_0.png -VTS\icon.png +vts\icon.png a 0 diff --git a/data/art824/warehouse/warehouse_a_2_2.PNG b/data/art824/warehouse/warehouse_a_2_2.png similarity index 100% rename from data/art824/warehouse/warehouse_a_2_2.PNG rename to data/art824/warehouse/warehouse_a_2_2.png diff --git a/data/makefile b/data/makefile index 0d858f1..189681b 100644 --- a/data/makefile +++ b/data/makefile @@ -1,11 +1,14 @@ -# -# Depth related settings, default 8 -# - MONO=mono -#CPP=gcc -E -P -x c -Wno-trigraphs + +UNAME := $(shell uname) +ifeq ($(UNAME), Darwin) +INICRUNCH=inicrunch_osx CPP=cpp -P -Wno-invalid-pp-token -Wno-trigraphs -INICRUNCH=inicrunch +endif +ifeq ($(UNAME), Linux) +INICRUNCH=inicrunch_linux +CPP=cpp -P -Wno-trigraphs +endif HELPFILE=help.txt @@ -171,16 +174,16 @@ $(ARTDIR)/bitmaps/galax2c.bmp \ $(ARTDIR)/bitmaps/galax3a.bmp \ $(ARTDIR)/bitmaps/galax3b.bmp \ $(ARTDIR)/bitmaps/galax3c.bmp \ -$(ARTDIR)/bitmaps/placementBad.bmp \ -$(ARTDIR)/bitmaps/placementGood.bmp \ +$(ARTDIR)/bitmaps/placementbad.bmp \ +$(ARTDIR)/bitmaps/placementgood.bmp \ $(ARTDIR)/bitmaps/plant.bmp \ $(ARTDIR)/bitmaps/plant1.bmp \ $(ARTDIR)/bitmaps/plant2.bmp \ $(ARTDIR)/bitmaps/plant3.bmp \ $(ARTDIR)/bitmaps/plant4.bmp \ $(ARTDIR)/bitmaps/plant5.bmp \ -$(ARTDIR)/bitmaps/RocketArtifact.bmp \ -$(ARTDIR)/bitmaps/Rocks.bmp \ +$(ARTDIR)/bitmaps/rocketartifact.bmp \ +$(ARTDIR)/bitmaps/rocks.bmp \ $(ARTDIR)/bitmaps/tree.bmp \ $(ARTDIR)/bitmaps/tree1.bmp \ $(ARTDIR)/bitmaps/tree2.bmp \ diff --git a/inicrunch/Makefile b/inicrunch/Makefile new file mode 100644 index 0000000..a58eb7d --- /dev/null +++ b/inicrunch/Makefile @@ -0,0 +1,16 @@ +TOOLDIR=../bin +CPP_FLAGS=-Wno-multichar -Wno-write-strings + +UNAME := $(shell uname) +ifeq ($(UNAME), Darwin) +BINARY=inicrunch_osx +endif +ifeq ($(UNAME), Linux) +BINARY=inicrunch_linux +endif + +all: + g++ $(CPP_FLAGS) main.cpp ini.cpp -o $(TOOLDIR)/$(BINARY) + +clean: + rm -f $(TOOLDIR)/$(BINARY) diff --git a/inicrunch/ini.cpp b/inicrunch/ini.cpp index b6688ce..f0c33a8 100644 --- a/inicrunch/ini.cpp +++ b/inicrunch/ini.cpp @@ -204,7 +204,7 @@ IniSection *LoadIniFile(char *pszFn, int *pcSections) FILE *pf = fopen(pszFn, "rb"); if (pf == NULL) - return false; + return NULL; while (true) { // Get the next line diff --git a/inicrunch/ini.h b/inicrunch/ini.h index ef5d787..28e582c 100644 --- a/inicrunch/ini.h +++ b/inicrunch/ini.h @@ -1,7 +1,10 @@ -typedef unsigned long dword; +typedef unsigned int dword; typedef unsigned char byte; typedef unsigned short word; + +#ifndef NULL #define NULL 0 +#endif #include diff --git a/inicrunch/make.sh b/inicrunch/make.sh deleted file mode 100755 index f26c7cd..0000000 --- a/inicrunch/make.sh +++ /dev/null @@ -1 +0,0 @@ -gcc -lstdc++ main.cpp ini.cpp -o ../bin/inicrunch \ No newline at end of file