Skip to content

Commit

Permalink
Removed tracing code from master, will be added back in separate branch
Browse files Browse the repository at this point in the history
  • Loading branch information
ata4 committed Dec 24, 2017
1 parent 5610061 commit cb39539
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 1,345 deletions.
21 changes: 0 additions & 21 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
cmake_minimum_required(VERSION 2.8)

option(RETRACER "Set to ON to build the retracer tool" ${RETRACER})

project(angrylion-plus)

# set policy CMP0042 for MacOS X
Expand Down Expand Up @@ -94,22 +92,3 @@ add_library(${NAME_PLUGIN_M64P} SHARED ${SOURCES_PLUGIN_M64P})
set_target_properties(${NAME_PLUGIN_M64P} PROPERTIES PREFIX "")

target_link_libraries(${NAME_PLUGIN_M64P} alp-core alp-plugin-common ${OPENGL_LIBRARIES})

if(RETRACER)
# RDP retracer
set(NAME_RETRACER "${CMAKE_PROJECT_NAME}-retrace")
set(PATH_RETRACER "retrace")
set(LIB_RETRACER alp-core pthread)

# optionally use SDL2 for visual output
find_package(SDL2)
if(SDL2_FOUND)
set(LIB_RETRACER ${LIB_RETRACER} SDL2)
add_definitions(-DRETRACE_SDL)
endif(SDL2_FOUND)

file(GLOB SOURCES_RETRACE "${PATH_RETRACER}/*.c")
add_executable(${NAME_RETRACER} ${SOURCES_RETRACE})

target_link_libraries(${NAME_RETRACER} ${LIB_RETRACER})
endif(RETRACER)
20 changes: 5 additions & 15 deletions angrylion-plus.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2003
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core\core.vcxproj", "{D86C6E84-3371-4B20-8620-A703FF3F2CC5}"
EndProject
Expand All @@ -10,11 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-zilmar", "plugin-zil
{13F7DDD7-2282-408A-AEF9-72266E0236DC} = {13F7DDD7-2282-408A-AEF9-72266E0236DC}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "retrace", "retrace\retrace.vcxproj", "{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}"
ProjectSection(ProjectDependencies) = postProject
{D86C6E84-3371-4B20-8620-A703FF3F2CC5} = {D86C6E84-3371-4B20-8620-A703FF3F2CC5}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-mupen64plus", "plugin-mupen64plus\plugin-mupen64plus.vcxproj", "{54BDC4EF-2526-47F7-A73E-C1C0FBC0237C}"
ProjectSection(ProjectDependencies) = postProject
{D86C6E84-3371-4B20-8620-A703FF3F2CC5} = {D86C6E84-3371-4B20-8620-A703FF3F2CC5}
Expand Down Expand Up @@ -50,14 +45,6 @@ Global
{722AD25D-C281-48FB-9A58-7699E50F8E6D}.Release|x64.Build.0 = Release|x64
{722AD25D-C281-48FB-9A58-7699E50F8E6D}.Release|x86.ActiveCfg = Release|Win32
{722AD25D-C281-48FB-9A58-7699E50F8E6D}.Release|x86.Build.0 = Release|Win32
{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}.Debug|x64.ActiveCfg = Debug|x64
{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}.Debug|x64.Build.0 = Debug|x64
{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}.Debug|x86.ActiveCfg = Debug|Win32
{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}.Debug|x86.Build.0 = Debug|Win32
{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}.Release|x64.ActiveCfg = Release|x64
{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}.Release|x64.Build.0 = Release|x64
{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}.Release|x86.ActiveCfg = Release|Win32
{BF695B2A-BB1E-4FF4-9087-1DC00FA2E324}.Release|x86.Build.0 = Release|Win32
{54BDC4EF-2526-47F7-A73E-C1C0FBC0237C}.Debug|x64.ActiveCfg = Debug|x64
{54BDC4EF-2526-47F7-A73E-C1C0FBC0237C}.Debug|x64.Build.0 = Debug|x64
{54BDC4EF-2526-47F7-A73E-C1C0FBC0237C}.Debug|x86.ActiveCfg = Debug|Win32
Expand All @@ -78,4 +65,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2896B5DF-D1A8-4A2B-BB7D-835C07F05863}
EndGlobalSection
EndGlobal
Loading

0 comments on commit cb39539

Please sign in to comment.