From: chaoskagami Date: Fri, 6 May 2016 11:14:54 +0000 (-0400) Subject: Autotoolizing things...etc X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=a352682be5e020625c2e918983aed525a50d862c;p=vn%2Fvndc.git Autotoolizing things...etc --- diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..cd01dab --- /dev/null +++ b/Makefile.in @@ -0,0 +1,64 @@ +SHELL = /bin/sh +top_srcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +.SUFFIXES: +.SUFFIXES: .c .o + +OPT=-g -O + +AR = ar +AR_FLAGS = rc +RANLIB = @RANLIB@ + +CC = @CC@ +CFLAGS = -I. @CFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +INSTALL = @INSTALL@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = $(exec_prefix)/bin +libdir = $(prefix)/lib +infodir = $(prefix)/info + +SOURCES=Data.cpp Loop.cpp op_bgload.cpp op_choice.cpp op_cleartext.cpp op_delay.cpp op_fi.cpp op_goto.cpp op_gsetvar.cpp op_if.cpp op_jump.cpp op_music.cpp op_random.cpp op_save.cpp op_setimg.cpp op_setvar.cpp op_sound.cpp op_text.cpp Parse.cpp VNDC.cpp + +OBJS=Data.o Loop.o op_bgload.o op_choice.o op_cleartext.o op_delay.o op_fi.o op_goto.o op_gsetvar.o op_if.o op_jump.o op_music.o op_random.o op_save.o op_setimg.o op_setvar.o op_sound.o op_text.o Parse.o VNDC.o + +MISC=configure mkinstalldirs install-sh aclocal.m4 + +# ??? replace with your targets +all: vndc + +# ??? here I make the bindir, libdir and infodir directories; you +# might not need all of these. also, I assumed the names PROG and +# libMYPROG.a for the program and library. +install: all + $(top_srcdir)/mkinstalldirs $(bindir) + $(top_srcdir)/mkinstalldirs $(libdir) + $(top_srcdir)/mkinstalldirs $(infodir) + $(INSTALL) vndc $(bindir)/vndc + +uninstall: + /bin/rm -f $(bindir)/vndc + +vndc: $(SOURCES) + $(CXX) $(CXXFLAGS) -o vndc $(OBJS) + +clean: + /bin/rm -f *.o vndc + +distclean: clean + /bin/rm -f Makefile config.h config.status config.cache config.log + +nuke: distclean + /bin/rm -fr autom4te.cache configure + +mostlyclean: clean + +maintainer-clean: clean + +#PROG.info: PROG.texi +# makeinfo PROG.texi diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..f378f20 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +autoreconf -f -i diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..1bbc075 --- /dev/null +++ b/config.h.in @@ -0,0 +1,70 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `munmap' function. */ +#undef HAVE_MUNMAP + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +#undef _UINT64_T + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +#undef uint64_t diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..327b973 --- /dev/null +++ b/configure.ac @@ -0,0 +1,18 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.69]) +AC_INIT([libbinmod], [0.3], [chaos.kagami@gmail.com], [vndc], [http://github.com/chaoskagami/vndc]) +AC_CONFIG_SRCDIR([VNDC.cpp]) + +# Checks for programs. +AC_PROG_CC +AC_PROG_CXX +AC_PROG_INSTALL +AC_PROG_RANLIB + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_UINT64_T + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/external/.keep b/external/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/external/zero/.keep b/external/zero/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/vndc/include/Data.hpp b/include/Data.hpp similarity index 100% rename from vndc/include/Data.hpp rename to include/Data.hpp diff --git a/vndc/include/Funcs.hpp b/include/Funcs.hpp similarity index 100% rename from vndc/include/Funcs.hpp rename to include/Funcs.hpp diff --git a/vndc/include/gitrev.hpp b/include/gitrev.hpp similarity index 100% rename from vndc/include/gitrev.hpp rename to include/gitrev.hpp diff --git a/install-sh b/install-sh new file mode 100755 index 0000000..0b0fdcb --- /dev/null +++ b/install-sh @@ -0,0 +1,501 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2013-12-25.23; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +tab=' ' +nl=' +' +IFS=" $tab$nl" + +# Set DOITPROG to "echo" to test this script. + +doit=${DOITPROG-} +doit_exec=${doit:-exec} + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +is_target_a_directory=possibly + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac + shift +done + +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + dstdir=`dirname "$dst"` + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + oIFS=$IFS + IFS=/ + set -f + set fnord $dstdir + shift + set +f + IFS=$oIFS + + prefixes= + + for d + do + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + set +f && + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/external/zero/include/AudioManager.hpp b/platform/include/AudioManager.hpp similarity index 100% rename from external/zero/include/AudioManager.hpp rename to platform/include/AudioManager.hpp diff --git a/external/zero/include/ContextManager.hpp b/platform/include/ContextManager.hpp similarity index 100% rename from external/zero/include/ContextManager.hpp rename to platform/include/ContextManager.hpp diff --git a/external/zero/include/TextManager.hpp b/platform/include/TextManager.hpp similarity index 100% rename from external/zero/include/TextManager.hpp rename to platform/include/TextManager.hpp diff --git a/external/zero/include/UDisplayable.hpp b/platform/include/UDisplayable.hpp similarity index 100% rename from external/zero/include/UDisplayable.hpp rename to platform/include/UDisplayable.hpp diff --git a/external/zero/include/VertexController.hpp b/platform/include/VertexController.hpp similarity index 100% rename from external/zero/include/VertexController.hpp rename to platform/include/VertexController.hpp diff --git a/external/zero/include/Zero.hpp b/platform/include/Zero.hpp similarity index 100% rename from external/zero/include/Zero.hpp rename to platform/include/Zero.hpp diff --git a/external/zero/src/AudioManager.cpp b/platform/src/AudioManager.cpp similarity index 100% rename from external/zero/src/AudioManager.cpp rename to platform/src/AudioManager.cpp diff --git a/external/zero/src/ContextManager.cpp b/platform/src/ContextManager.cpp similarity index 100% rename from external/zero/src/ContextManager.cpp rename to platform/src/ContextManager.cpp diff --git a/external/zero/src/TextManager.cpp b/platform/src/TextManager.cpp similarity index 100% rename from external/zero/src/TextManager.cpp rename to platform/src/TextManager.cpp diff --git a/external/zero/src/UDisplayable.cpp b/platform/src/UDisplayable.cpp similarity index 100% rename from external/zero/src/UDisplayable.cpp rename to platform/src/UDisplayable.cpp diff --git a/external/zero/src/VertexController.cpp b/platform/src/VertexController.cpp similarity index 100% rename from external/zero/src/VertexController.cpp rename to platform/src/VertexController.cpp diff --git a/vndc/src/Data.cpp b/src/Data.cpp similarity index 100% rename from vndc/src/Data.cpp rename to src/Data.cpp diff --git a/vndc/src/Loop.cpp b/src/Loop.cpp similarity index 100% rename from vndc/src/Loop.cpp rename to src/Loop.cpp diff --git a/vndc/src/Parse.cpp b/src/Parse.cpp similarity index 100% rename from vndc/src/Parse.cpp rename to src/Parse.cpp diff --git a/vndc/src/VNDC.cpp b/src/VNDC.cpp similarity index 100% rename from vndc/src/VNDC.cpp rename to src/VNDC.cpp diff --git a/vndc/src/op_bgload.cpp b/src/op_bgload.cpp similarity index 100% rename from vndc/src/op_bgload.cpp rename to src/op_bgload.cpp diff --git a/vndc/src/op_choice.cpp b/src/op_choice.cpp similarity index 100% rename from vndc/src/op_choice.cpp rename to src/op_choice.cpp diff --git a/vndc/src/op_cleartext.cpp b/src/op_cleartext.cpp similarity index 100% rename from vndc/src/op_cleartext.cpp rename to src/op_cleartext.cpp diff --git a/vndc/src/op_delay.cpp b/src/op_delay.cpp similarity index 100% rename from vndc/src/op_delay.cpp rename to src/op_delay.cpp diff --git a/vndc/src/op_fi.cpp b/src/op_fi.cpp similarity index 100% rename from vndc/src/op_fi.cpp rename to src/op_fi.cpp diff --git a/vndc/src/op_goto.cpp b/src/op_goto.cpp similarity index 100% rename from vndc/src/op_goto.cpp rename to src/op_goto.cpp diff --git a/vndc/src/op_gsetvar.cpp b/src/op_gsetvar.cpp similarity index 100% rename from vndc/src/op_gsetvar.cpp rename to src/op_gsetvar.cpp diff --git a/vndc/src/op_if.cpp b/src/op_if.cpp similarity index 100% rename from vndc/src/op_if.cpp rename to src/op_if.cpp diff --git a/vndc/src/op_jump.cpp b/src/op_jump.cpp similarity index 100% rename from vndc/src/op_jump.cpp rename to src/op_jump.cpp diff --git a/vndc/src/op_music.cpp b/src/op_music.cpp similarity index 100% rename from vndc/src/op_music.cpp rename to src/op_music.cpp diff --git a/vndc/src/op_random.cpp b/src/op_random.cpp similarity index 100% rename from vndc/src/op_random.cpp rename to src/op_random.cpp diff --git a/vndc/src/op_save.cpp b/src/op_save.cpp similarity index 100% rename from vndc/src/op_save.cpp rename to src/op_save.cpp diff --git a/vndc/src/op_setimg.cpp b/src/op_setimg.cpp similarity index 100% rename from vndc/src/op_setimg.cpp rename to src/op_setimg.cpp diff --git a/vndc/src/op_setvar.cpp b/src/op_setvar.cpp similarity index 100% rename from vndc/src/op_setvar.cpp rename to src/op_setvar.cpp diff --git a/vndc/src/op_sound.cpp b/src/op_sound.cpp similarity index 100% rename from vndc/src/op_sound.cpp rename to src/op_sound.cpp diff --git a/vndc/src/op_text.cpp b/src/op_text.cpp similarity index 100% rename from vndc/src/op_text.cpp rename to src/op_text.cpp diff --git a/vndc/.keep b/vndc/.keep deleted file mode 100644 index e69de29..0000000