Skip to content

Commit

Permalink
Merge pull request AntiMicroX#85 from juliagoda/testing
Browse files Browse the repository at this point in the history
Testing
  • Loading branch information
juliagoda authored Jan 7, 2020
2 parents aa62354 + c77b754 commit 2a6f939
Show file tree
Hide file tree
Showing 343 changed files with 9,053 additions and 6,138 deletions.
113 changes: 0 additions & 113 deletions .appveyor.yml

This file was deleted.

16 changes: 6 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,20 @@
*.mo
.flatpak-builder
Makefile
antimicro
!share/antimicro
antimicro.pro.user
antimicro.pro.user.*
antimicroX
!share/antimicroX
antimicroX.pro.user
antimicroX.pro.user.*
moc_*
qrc_resources.cpp
ui_*.h
*.*~
SDL2-2.0.3/
SDL2-2.0.4/
vmulti/
windows/*.msi
windows/*.wix*
SDL2-*
build/
build-dir/
Build/
CMakeLists.txt.user*
other/antimicro.1.gz
other/antimicroX.1.gz
other/license-template.txt
doc/
compile/
Expand Down
91 changes: 0 additions & 91 deletions .travis.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<map version="1.0.1">
<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
<node CREATED="1379712845116" ID="ID_571348173" MODIFIED="1526063409822" TEXT="Antimicro Future Developments">
<node CREATED="1379712845116" ID="ID_571348173" MODIFIED="1526063409822" TEXT="AntimicroX Future Developments">
<font BOLD="true" NAME="Arial Black" SIZE="18"/>
<node CREATED="1526058011028" ID="ID_121032400" MODIFIED="1530549062564" POSITION="right" TEXT="Add controller calibration">
<font BOLD="true" NAME="Verdana" SIZE="14"/>
Expand Down
22 changes: 1 addition & 21 deletions BuildOptions.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build Options for CMake

There are a few application specific options that can be used when running
cmake to build antimicro. The following file will attempt to list some of those
cmake to build antimicroX. The following file will attempt to list some of those
options and describe their use in the project.


Expand All @@ -21,9 +21,6 @@ command for qm files. -noobsolete is a method for getting rid of obsolete text e

Default: OFF. Allows for the launch of test sources with unit tests

-DUSE_SDL_2

Default: ON. Compile the program with SDL 2.


## Linux Options
Expand All @@ -44,20 +41,3 @@ Default: ON. Compile the program with X11 support.

Default: ON. Compile the program with XTest support.


## Windows Options

-DPORTABLE_PACKAGE

Default: OFF. Compile the program with extra changes used for containing the
final program to a single directory.

-DWITH_VMULTI

Default: OFF. Compile the program with support for the vmulti driver.

-DPERFORM_SIGNING

Default: OFF. This option is only included for testing. It should not be used
currently.

Loading

0 comments on commit 2a6f939

Please sign in to comment.