summaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
authorGravatar bunnei2014-09-01 22:29:23 -0400
committerGravatar bunnei2014-09-01 22:29:23 -0400
commitc0e48432cd262baa6ed84b33cd9dd0d8f585e345 (patch)
tree0ed8ccb8b5c42ee27c0c44969771bbd77af8ebf8 /src/citra
parentMerge pull request #84 from bunnei/fix-hw-synchronization (diff)
parentRemove hand-crafted Visual Studio solution. (diff)
downloadyuzu-c0e48432cd262baa6ed84b33cd9dd0d8f585e345.tar.gz
yuzu-c0e48432cd262baa6ed84b33cd9dd0d8f585e345.tar.xz
yuzu-c0e48432cd262baa6ed84b33cd9dd0d8f585e345.zip
Merge pull request #69 from yuriks/cmake-cleanup
CMake cleanup
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/CMakeLists.txt24
-rw-r--r--src/citra/citra.vcxproj215
-rw-r--r--src/citra/citra.vcxproj.filters23
-rw-r--r--src/citra/emu_window/emu_window_glfw.h1
4 files changed, 18 insertions, 245 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 1cbe22cc0..f10f3e603 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -1,6 +1,13 @@
1set(SRCS citra.cpp 1set(SRCS
2 emu_window/emu_window_glfw.cpp) 2 emu_window/emu_window_glfw.cpp
3set(HEADERS resource.h) 3 citra.cpp
4 )
5set(HEADERS
6 emu_window/emu_window_glfw.h
7 resource.h
8 )
9
10create_directory_groups(${SRCS} ${HEADERS})
4 11
5# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable) 12# NOTE: This is a workaround for CMake bug 0006976 (missing X11_xf86vmode_LIB variable)
6if (NOT X11_xf86vmode_LIB) 13if (NOT X11_xf86vmode_LIB)
@@ -8,11 +15,16 @@ if (NOT X11_xf86vmode_LIB)
8endif() 15endif()
9 16
10add_executable(citra ${SRCS} ${HEADERS}) 17add_executable(citra ${SRCS} ${HEADERS})
18target_link_libraries(citra core common video_core)
19target_link_libraries(citra ${OPENGL_gl_LIBRARY} ${GLFW_LIBRARIES})
11 20
12if (APPLE) 21if (APPLE)
13 target_link_libraries(citra core common video_core iconv pthread ${COREFOUNDATION_LIBRARY} ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} ${GLFW_LIBRARIES}) 22 target_link_libraries(citra iconv pthread ${COREFOUNDATION_LIBRARY})
14else() 23elseif (WIN32)
15 target_link_libraries(citra core common video_core GLEW pthread X11 Xxf86vm Xi Xcursor ${OPENGL_LIBRARIES} ${GLFW_LIBRARIES} rt ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB} ${PNG_LIBRARIES}) 24 target_link_libraries(citra winmm)
25else() # Unix
26 target_link_libraries(citra pthread rt)
27 target_link_libraries(citra ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_Xcursor_LIB} ${X11_Xrandr_LIB} ${X11_xv86vmode_LIB})
16endif() 28endif()
17 29
18#install(TARGETS citra RUNTIME DESTINATION ${bindir}) 30#install(TARGETS citra RUNTIME DESTINATION ${bindir})
diff --git a/src/citra/citra.vcxproj b/src/citra/citra.vcxproj
deleted file mode 100644
index bda1ed07d..000000000
--- a/src/citra/citra.vcxproj
+++ /dev/null
@@ -1,215 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup Label="ProjectConfigurations">
4 <ProjectConfiguration Include="Debug|Win32">
5 <Configuration>Debug</Configuration>
6 <Platform>Win32</Platform>
7 </ProjectConfiguration>
8 <ProjectConfiguration Include="Debug|x64">
9 <Configuration>Debug</Configuration>
10 <Platform>x64</Platform>
11 </ProjectConfiguration>
12 <ProjectConfiguration Include="Release|Win32">
13 <Configuration>Release</Configuration>
14 <Platform>Win32</Platform>
15 </ProjectConfiguration>
16 <ProjectConfiguration Include="Release|x64">
17 <Configuration>Release</Configuration>
18 <Platform>x64</Platform>
19 </ProjectConfiguration>
20 </ItemGroup>
21 <PropertyGroup Label="Globals">
22 <ProjectGuid>{CE7D2C07-21CE-4590-81AB-2ADA88A2B85F}</ProjectGuid>
23 <Keyword>Win32Proj</Keyword>
24 <RootNamespace>emu_win32</RootNamespace>
25 <ProjectName>citra</ProjectName>
26 </PropertyGroup>
27 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29 <ConfigurationType>Application</ConfigurationType>
30 <UseDebugLibraries>true</UseDebugLibraries>
31 <PlatformToolset>v120</PlatformToolset>
32 </PropertyGroup>
33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
34 <ConfigurationType>Application</ConfigurationType>
35 <UseDebugLibraries>true</UseDebugLibraries>
36 <PlatformToolset>v120</PlatformToolset>
37 </PropertyGroup>
38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
39 <ConfigurationType>Application</ConfigurationType>
40 <UseDebugLibraries>false</UseDebugLibraries>
41 <PlatformToolset>v120</PlatformToolset>
42 </PropertyGroup>
43 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
44 <ConfigurationType>Application</ConfigurationType>
45 <UseDebugLibraries>false</UseDebugLibraries>
46 <PlatformToolset>v120</PlatformToolset>
47 </PropertyGroup>
48 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
49 <ImportGroup Label="ExtensionSettings">
50 </ImportGroup>
51 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
52 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
53 <Import Project="..\..\vsprops\base.props" />
54 <Import Project="..\..\vsprops\externals.props" />
55 <Import Project="..\..\vsprops\code_generation_debug.props" />
56 <Import Project="..\..\vsprops\app.props" />
57 <Import Project="..\..\vsprops\optimization_debug.props" />
58 </ImportGroup>
59 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
60 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61 <Import Project="..\..\vsprops\base.props" />
62 <Import Project="..\..\vsprops\externals.props" />
63 <Import Project="..\..\vsprops\code_generation_debug.props" />
64 <Import Project="..\..\vsprops\app.props" />
65 <Import Project="..\..\vsprops\optimization_debug.props" />
66 </ImportGroup>
67 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
68 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69 <Import Project="..\..\vsprops\base.props" />
70 <Import Project="..\..\vsprops\externals.props" />
71 <Import Project="..\..\vsprops\code_generation_release.props" />
72 <Import Project="..\..\vsprops\app.props" />
73 <Import Project="..\..\vsprops\optimization_release.props" />
74 </ImportGroup>
75 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
76 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
77 <Import Project="..\..\vsprops\base.props" />
78 <Import Project="..\..\vsprops\externals.props" />
79 <Import Project="..\..\vsprops\code_generation_release.props" />
80 <Import Project="..\..\vsprops\app.props" />
81 <Import Project="..\..\vsprops\optimization_release.props" />
82 </ImportGroup>
83 <PropertyGroup Label="UserMacros" />
84 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
85 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
86 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
87 <CustomBuildBeforeTargets>
88 </CustomBuildBeforeTargets>
89 </PropertyGroup>
90 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
91 <CustomBuildBeforeTargets />
92 </PropertyGroup>
93 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
94 <ClCompile>
95 <PrecompiledHeader>
96 </PrecompiledHeader>
97 </ClCompile>
98 <Link />
99 <CustomBuildStep>
100 <Outputs>
101 </Outputs>
102 <Command>
103 </Command>
104 </CustomBuildStep>
105 <PreBuildEvent />
106 <Link />
107 <Link>
108 <IgnoreSpecificDefaultLibraries>
109 </IgnoreSpecificDefaultLibraries>
110 </Link>
111 </ItemDefinitionGroup>
112 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
113 <ClCompile>
114 <PrecompiledHeader>
115 </PrecompiledHeader>
116 </ClCompile>
117 <Link />
118 <CustomBuildStep>
119 <Outputs>
120 </Outputs>
121 <Command>
122 </Command>
123 </CustomBuildStep>
124 <PreBuildEvent />
125 <Link>
126 <IgnoreSpecificDefaultLibraries>msvcrtd.lib;msvcrt.lib</IgnoreSpecificDefaultLibraries>
127 </Link>
128 </ItemDefinitionGroup>
129 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
130 <ClCompile>
131 <PrecompiledHeader>
132 </PrecompiledHeader>
133 </ClCompile>
134 <Link>
135 <SpecifySectionAttributes>
136 </SpecifySectionAttributes>
137 <IgnoreSpecificDefaultLibraries>
138 </IgnoreSpecificDefaultLibraries>
139 </Link>
140 <CustomBuildStep>
141 <Command>
142 </Command>
143 </CustomBuildStep>
144 <CustomBuildStep>
145 <Message>
146 </Message>
147 </CustomBuildStep>
148 <CustomBuildStep>
149 <Outputs>
150 </Outputs>
151 </CustomBuildStep>
152 <PreBuildEvent />
153 </ItemDefinitionGroup>
154 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
155 <ClCompile>
156 <PrecompiledHeader>
157 </PrecompiledHeader>
158 </ClCompile>
159 <Link>
160 <SpecifySectionAttributes>
161 </SpecifySectionAttributes>
162 <IgnoreAllDefaultLibraries>
163 </IgnoreAllDefaultLibraries>
164 <IgnoreSpecificDefaultLibraries>libcmt.lib</IgnoreSpecificDefaultLibraries>
165 </Link>
166 <CustomBuildStep>
167 <Command>
168 </Command>
169 </CustomBuildStep>
170 <CustomBuildStep>
171 <Message>
172 </Message>
173 </CustomBuildStep>
174 <CustomBuildStep>
175 <Outputs>
176 </Outputs>
177 </CustomBuildStep>
178 <PreBuildEvent />
179 </ItemDefinitionGroup>
180 <ItemGroup>
181 <ProjectReference Include="..\common\common.vcxproj">
182 <Project>{dfe335fc-755d-4baa-8452-94434f8a1edb}</Project>
183 <Private>true</Private>
184 <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
185 <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
186 <LinkLibraryDependencies>true</LinkLibraryDependencies>
187 <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
188 </ProjectReference>
189 <ProjectReference Include="..\core\core.vcxproj">
190 <Project>{8aea7f29-3466-4786-a10d-6a4bd0610977}</Project>
191 <Private>true</Private>
192 <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
193 <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
194 <LinkLibraryDependencies>true</LinkLibraryDependencies>
195 <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
196 </ProjectReference>
197 <ProjectReference Include="..\video_core\video_core.vcxproj">
198 <Project>{6678d1a3-33a6-48a9-878b-48e5d2903d27}</Project>
199 </ProjectReference>
200 </ItemGroup>
201 <ItemGroup>
202 <ClCompile Include="citra.cpp" />
203 <ClCompile Include="emu_window\emu_window_glfw.cpp" />
204 </ItemGroup>
205 <ItemGroup>
206 <ClInclude Include="emu_window\emu_window_glfw.h" />
207 <ClInclude Include="resource.h" />
208 </ItemGroup>
209 <ItemGroup>
210 <Text Include="CMakeLists.txt" />
211 </ItemGroup>
212 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
213 <ImportGroup Label="ExtensionTargets">
214 </ImportGroup>
215</Project>
diff --git a/src/citra/citra.vcxproj.filters b/src/citra/citra.vcxproj.filters
deleted file mode 100644
index 78954670e..000000000
--- a/src/citra/citra.vcxproj.filters
+++ /dev/null
@@ -1,23 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup>
4 <Filter Include="emu_window">
5 <UniqueIdentifier>{e3161526-9f53-4670-8dae-2be81ff01bc2}</UniqueIdentifier>
6 </Filter>
7 </ItemGroup>
8 <ItemGroup>
9 <ClCompile Include="citra.cpp" />
10 <ClCompile Include="emu_window\emu_window_glfw.cpp">
11 <Filter>emu_window</Filter>
12 </ClCompile>
13 </ItemGroup>
14 <ItemGroup>
15 <ClInclude Include="resource.h" />
16 <ClInclude Include="emu_window\emu_window_glfw.h">
17 <Filter>emu_window</Filter>
18 </ClInclude>
19 </ItemGroup>
20 <ItemGroup>
21 <Text Include="CMakeLists.txt" />
22 </ItemGroup>
23</Project>
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index 5898ec177..c1b41203b 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -4,7 +4,6 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <GL/glew.h>
8#include <GLFW/glfw3.h> 7#include <GLFW/glfw3.h>
9 8
10#include "common/emu_window.h" 9#include "common/emu_window.h"
HIC SVNT DRACONES