[Premake, 3PP] Formatting/cleanup

src/xenia/base/premake5.lua

@@ -9,8 +9,10 @@ project("xenia-base")
     "fmt",
   })
   local_platform_files()
-  removefiles({"console_app_main_*.cc"})
+  removefiles({
-  removefiles({"main_init_*.cc"})
+    "console_app_main_*.cc",
+    "main_init_*.cc",
+  })
   files({
     "debug_visualizers.natvis",
   })

src/xenia/cpu/ppc/testing/premake5.lua

@@ -27,7 +27,9 @@ project("xenia-cpu-ppc-tests")
     "*.s",
   })
   filter("files:*.s")
-    flags({"ExcludeFromBuild"})
+    flags({
+      "ExcludeFromBuild",
+    })
   filter("architecture:x86_64")
     links({
       "xenia-cpu-backend-x64",
@@ -40,7 +42,9 @@ project("xenia-cpu-ppc-tests")
     })
 
     -- xenia-base needs this
-    links({"xenia-ui"})
+    links({
+      "xenia-ui",
+    })
 
 if ARCH == "ppc64" or ARCH == "powerpc64" then
 
@@ -61,7 +65,9 @@ project("xenia-cpu-ppc-nativetests")
     "seq_*.s",
   })
   filter("files:instr_*.s", "files:seq_*.s")
-    flags({"ExcludeFromBuild"})
+    flags({
+      "ExcludeFromBuild",
+    })
   filter({})
   buildoptions({
     "-Wa,-mregnames",  -- Tell GAS to accept register names.

src/xenia/hid/premake5.lua

@@ -11,4 +11,6 @@ project("xenia-hid")
     "xenia-hid-skylander",
   })
   local_platform_files()
-  removefiles({"*_demo.cc"})
+  removefiles({
+    "*_demo.cc",
+  })

src/xenia/premake5.lua

@@ -10,4 +10,7 @@ project("xenia-core")
     "fmt",
     "xenia-base",
   })
-  files({"*.h", "*.cc"})
+  files({
+    "*.h",
+    "*.cc",
+  })

src/xenia/ui/premake5.lua

@@ -10,8 +10,10 @@ project("xenia-ui")
     "xenia-base",
   })
   local_platform_files()
-  removefiles({"*_demo.cc"})
+  removefiles({
-  removefiles({"windowed_app_main_*.cc"})
+    "*_demo.cc",
+    "windowed_app_main_*.cc",
+  })
   filter("platforms:Android-*")
     -- Exports JNI functions.
     wholelib("On")

src/xenia/vfs/premake5.lua

@@ -13,7 +13,9 @@ project("xenia-vfs")
   })
 
   recursive_platform_files()
-  removefiles({"vfs_dump.cc"})
+  removefiles({
+    "vfs_dump.cc",
+  })
 
 if enableMiscSubprojects then
   project("xenia-vfs-dump")

third_party/crypto/rc4.c

@@ -1,90 +0,0 @@
-/*
-* rc4.c
-*
-* Copyright (c) 1996-2000 Whistle Communications, Inc.
-* All rights reserved.
-*
-* Subject to the following obligations and disclaimer of warranty, use and
-* redistribution of this software, in source or object code forms, with or
-* without modifications are expressly permitted by Whistle Communications;
-* provided, however, that:
-* 1. Any and all reproductions of the source or object code must include the
-*    copyright notice above and the following disclaimer of warranties; and
-* 2. No rights are granted, in any manner or form, to use Whistle
-*    Communications, Inc. trademarks, including the mark "WHISTLE
-*    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
-*    such appears in the above copyright notice or in the software.
-*
-* THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
-* TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
-* REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
-* INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
-* WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
-* REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
-* SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
-* IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
-* RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
-* WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-* PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
-* OF SUCH DAMAGE.
-*/
-
-#include "rc4.h"
-
-static __inline void swap_bytes(uint8_t *a, uint8_t *b) {
-  uint8_t temp;
-
-  temp = *a;
-  *a = *b;
-  *b = temp;
-}
-
-/*
-* Initialize an RC4 state buffer using the supplied key,
-* which can have arbitrary length.
-*/
-void rc4_init(struct rc4_state *const state, const uint8_t *key, int keylen) {
-  uint8_t j;
-  int i;
-
-  /* Initialize state with identity permutation */
-  for (i = 0; i < 256; i++) state->perm[i] = (uint8_t)i;
-  state->index1 = 0;
-  state->index2 = 0;
-
-  /* Randomize the permutation using key data */
-  for (j = i = 0; i < 256; i++) {
-    j += state->perm[i] + key[i % keylen];
-    swap_bytes(&state->perm[i], &state->perm[j]);
-  }
-}
-
-/*
-* Encrypt some data using the supplied RC4 state buffer.
-* The input and output buffers may be the same buffer.
-* Since RC4 is a stream cypher, this function is used
-* for both encryption and decryption.
-*/
-void rc4_crypt(struct rc4_state *const state, const uint8_t *inbuf,
-               uint8_t *outbuf, int buflen) {
-  int i;
-  uint8_t j;
-
-  for (i = 0; i < buflen; i++) {
-    /* Update modification indicies */
-    state->index1++;
-    state->index2 += state->perm[state->index1];
-
-    /* Modify permutation */
-    swap_bytes(&state->perm[state->index1], &state->perm[state->index2]);
-
-    /* Encrypt/decrypt next byte */
-    j = state->perm[state->index1] + state->perm[state->index2];
-    outbuf[i] = inbuf[i] ^ state->perm[j];
-  }
-}

third_party/crypto/rc4.h

@@ -1,50 +0,0 @@
-/*
-* rc4.h
-*
-* Copyright (c) 1996-2000 Whistle Communications, Inc.
-* All rights reserved.
-*
-* Subject to the following obligations and disclaimer of warranty, use and
-* redistribution of this software, in source or object code forms, with or
-* without modifications are expressly permitted by Whistle Communications;
-* provided, however, that:
-* 1. Any and all reproductions of the source or object code must include the
-*    copyright notice above and the following disclaimer of warranties; and
-* 2. No rights are granted, in any manner or form, to use Whistle
-*    Communications, Inc. trademarks, including the mark "WHISTLE
-*    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
-*    such appears in the above copyright notice or in the software.
-*
-* THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
-* TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
-* REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
-* INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
-* WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
-* REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
-* SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
-* IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
-* RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
-* WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-* PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-* THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
-* OF SUCH DAMAGE.
-*/
-
-#ifndef _SYS_CRYPTO_RC4_RC4_H_
-#define _SYS_CRYPTO_RC4_RC4_H_
-
-struct rc4_state {
-  uint8_t perm[256];
-  uint8_t index1;
-  uint8_t index2;
-};
-
-void rc4_init(struct rc4_state *state, const uint8_t *key, int keylen);
-void rc4_crypt(struct rc4_state *state, const uint8_t *inbuf, uint8_t *outbuf,
-               int buflen);
-
-#endif

third_party/libusb.lua

@@ -3,7 +3,9 @@ project("libusb")
   uuid("5f8b5485-fde5-4a42-8a13-8545fcf6d25b")
   kind("StaticLib")
   language("C")
-  includedirs({"libusb/libusb"})
+  includedirs({
+    "libusb/libusb",
+  })
 
   files({
     "libusb/libusb/core.c",
@@ -15,7 +17,9 @@ project("libusb")
   })
 
   filter({"platforms:Windows"})
-    includedirs({"libusb/msvc"})
+    includedirs({
+      "libusb/msvc",
+    })
     files({
       "libusb/libusb/os/events_windows.c",
       "libusb/libusb/os/events_windows.h",

tools/build/scripts/platform_files.lua

@@ -9,17 +9,26 @@ local function match_platform_files(base_path, base_match)
     base_path.."/"..base_match..".cpp",
     base_path.."/"..base_match..".inc",
   })
-  removefiles({base_path.."/".."**_main.cc"})
+  removefiles({
-  removefiles({base_path.."/".."**_test.cc"})
+    base_path.."/".."**_main.cc",
-  removefiles({base_path.."/".."**_posix.h", base_path.."/".."**_posix.cc"})
+    base_path.."/".."**_test.cc",
-  removefiles({base_path.."/".."**_linux.h", base_path.."/".."**_linux.cc"})
+    base_path.."/".."**_posix.h",
-  removefiles({base_path.."/".."**_gnulinux.h",
+    base_path.."/".."**_posix.cc",
-               base_path.."/".."**_gnulinux.cc"})
+    base_path.."/".."**_linux.h",
-  removefiles({base_path.."/".."**_x11.h", base_path.."/".."**_x11.cc"})
+    base_path.."/".."**_linux.cc",
-  removefiles({base_path.."/".."**_gtk.h", base_path.."/".."**_gtk.cc"})
+    base_path.."/".."**_gnulinux.h",
-  removefiles({base_path.."/".."**_android.h", base_path.."/".."**_android.cc"})
+    base_path.."/".."**_gnulinux.cc",
-  removefiles({base_path.."/".."**_mac.h", base_path.."/".."**_mac.cc"})
+    base_path.."/".."**_x11.h",
-  removefiles({base_path.."/".."**_win.h", base_path.."/".."**_win.cc"})
+    base_path.."/".."**_x11.cc",
+    base_path.."/".."**_gtk.h",
+    base_path.."/".."**_gtk.cc",
+    base_path.."/".."**_android.h",
+    base_path.."/".."**_android.cc",
+    base_path.."/".."**_mac.h",
+    base_path.."/".."**_mac.cc",
+    base_path.."/".."**_win.h",
+    base_path.."/".."**_win.cc",
+  })
   filter("platforms:Windows")
     files({
       base_path.."/"..base_match.."_win.h",