Skip to content

Commit

Permalink
chore: minor cleanups in codebase
Browse files Browse the repository at this point in the history
* Delete unused file

* Remove installing header files, because they are useless since when we are not providing libantilib

* Fix cmake warning caused by values mismatch

* Remove unused variable
  • Loading branch information
pktiuk authored Feb 20, 2021
1 parent 595be41 commit f4af7ef
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 79 deletions.
72 changes: 0 additions & 72 deletions AntiMicroX Future Developments.mm

This file was deleted.

4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ option(ANTIMICROX_PKG_VERSION "Manually define version of package displayed in i
if(ANTIMICROX_PKG_VERSION)
message("This build will be marked as: ${ANTIMICROX_PKG_VERSION}")
add_compile_definitions(ANTIMICROX_PKG_VERSION="${ANTIMICROX_PKG_VERSION}")
endif((ANTIMICROX_PKG_VERSION))
endif(ANTIMICROX_PKG_VERSION)

if(UNIX)
find_package(PkgConfig REQUIRED)
Expand Down Expand Up @@ -507,8 +507,6 @@ target_link_libraries(antimicrox
# Specify out directory for final executable.
if(UNIX)
install(TARGETS antimicrox RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
# install(TARGETS antilib DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(FILES ${antimicrox_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/antimicrox")
endif(UNIX)

if(UNIX)
Expand Down
4 changes: 0 additions & 4 deletions src/gamecontroller/xml/gamecontrollerxml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -614,19 +614,16 @@ void GameControllerXml::readJoystickConfigXmlLong(QList<SDL_GameControllerButton
{
int index = -1;
bool first = false;
bool second = false;
QString temp = QString();

assignVariablesShort(xml, index, temp);

if (xml->name() == "vdpadname")
{
first = dpadNameExists;
second = vdpadNameExists;
} else if (xml->name() == "dpadname")
{
first = vdpadNameExists;
second = dpadNameExists;
}

if ((index >= 0) && !temp.isEmpty() && !first)
Expand All @@ -648,7 +645,6 @@ void GameControllerXml::readJoystickConfigXmlLong(QList<SDL_GameControllerButton

if (found)
{
second = true;
VDPad *dpad = m_gameController->getActiveSetJoystick()->getVDPad(0);

if (dpad != nullptr)
Expand Down

0 comments on commit f4af7ef

Please sign in to comment.