From fbadc61c22d3e7e320117b6bf2fd22611e26a2c8 Mon Sep 17 00:00:00 2001
From: Taylor Richards <taylor@icculus.org>
Date: Sun, 22 Mar 2015 12:44:21 -0400
Subject: [PATCH] some missed file cleanup for launcher

---
 src/CMakeLists.txt                                           | 5 +++--
 src/launcher/launcher.cpp                                    | 4 ++--
 .../res/{fs2_snd_click_wav.inc => fs2_snd_click_wav.h}       | 2 +-
 .../res/{fs2_snd_hover_wav.inc => fs2_snd_hover_wav.h}       | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename src/launcher/res/{fs2_snd_click_wav.inc => fs2_snd_click_wav.h} (99%)
 rename src/launcher/res/{fs2_snd_hover_wav.inc => fs2_snd_hover_wav.h} (99%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88909d7..4c67a35 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -289,8 +289,9 @@ set(launcher_SOURCE
   ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/fs2_btn_volition-click.xpm
   ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/fs2_btn_volition-hover.xpm
   ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/fs2_btn_volition.xpm
-  ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/fs2_snd_click_wav.inc
-  ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/fs2_snd_hover_wav.inc
+  ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/fs2_help_txt.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/fs2_snd_click_wav.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/fs2_snd_hover_wav.h
   ${CMAKE_CURRENT_SOURCE_DIR}/launcher/res/volition_img.xpm
   PARENT_SCOPE
 )
diff --git a/src/launcher/launcher.cpp b/src/launcher/launcher.cpp
index a6d9477..7814d36 100644
--- a/src/launcher/launcher.cpp
+++ b/src/launcher/launcher.cpp
@@ -51,8 +51,8 @@
 #include "res/fs2_btn_volition-hover.xpm"
 #include "res/fs2_btn_volition-click.xpm"
 #include "res/fs2_help_txt.h"
-#include "res/fs2_snd_hover_wav.inc"
-#include "res/fs2_snd_click_wav.inc"
+#include "res/fs2_snd_hover_wav.h"
+#include "res/fs2_snd_click_wav.h"
 #else
 #include "res/freespace_img.xpm"
 #include "res/volition_img.xpm"
diff --git a/src/launcher/res/fs2_snd_click_wav.inc b/src/launcher/res/fs2_snd_click_wav.h
similarity index 99%
rename from src/launcher/res/fs2_snd_click_wav.inc
rename to src/launcher/res/fs2_snd_click_wav.h
index 8cbe361..4b4f427 100644
--- a/src/launcher/res/fs2_snd_click_wav.inc
+++ b/src/launcher/res/fs2_snd_click_wav.h
@@ -1,4 +1,4 @@
-unsigned char fs2_snd_click_wav[] = {
+unsigned const char fs2_snd_click_wav[] = {
   0x80, 0x80, 0x80, 0x80, 0x7f, 0x80, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
   0x7f, 0x80, 0x7f, 0x80, 0x7f, 0x80, 0x7f, 0x80, 0x80, 0x7e, 0x80, 0x7e,
   0x7e, 0x7f, 0x7d, 0x7e, 0x7e, 0x7f, 0x7f, 0x80, 0x7f, 0x80, 0x80, 0x7f,
diff --git a/src/launcher/res/fs2_snd_hover_wav.inc b/src/launcher/res/fs2_snd_hover_wav.h
similarity index 99%
rename from src/launcher/res/fs2_snd_hover_wav.inc
rename to src/launcher/res/fs2_snd_hover_wav.h
index 0a98a0d..7d7249f 100644
--- a/src/launcher/res/fs2_snd_hover_wav.inc
+++ b/src/launcher/res/fs2_snd_hover_wav.h
@@ -1,4 +1,4 @@
-unsigned char fs2_snd_hover_wav[] = {
+unsigned const char fs2_snd_hover_wav[] = {
   0x80, 0x80, 0x7f, 0x80, 0x80, 0x80, 0x80, 0x7f, 0x80, 0x7f, 0x80, 0x80,
   0x7f, 0x80, 0x80, 0x7e, 0x80, 0x7f, 0x80, 0x7f, 0x7f, 0x80, 0x80, 0x7e,
   0x80, 0x7f, 0x7f, 0x80, 0x7e, 0x80, 0x7f, 0x80, 0x7e, 0x80, 0x7f, 0x7f,
-- 
2.39.2