Permalink
Browse files

Merge pull request #482 from fzurita/GLideN64_update_oct_8

GLideN64 update oct 8
  • Loading branch information...
xperia64 committed Oct 9, 2015
2 parents 2d4dc01 + df38f63 commit 52ffc037ba67b8e0c9fe2879a74bb5bd601b553f
Showing with 653 additions and 91 deletions.
  1. +1 −0 jni/Android.mk
  2. +2 −1 jni/mupen64plus-video-gliden64.mk
  3. +1 −1 jni/mupen64plus-video-gliden64/ini/GLideN64.ini
  4. +17 −0 jni/mupen64plus-video-gliden64/projects/msvc12/GLideN64.sln
  5. +8 −8 jni/mupen64plus-video-gliden64/projects/msvc12/GLideN64.vcxproj
  6. +3 −4 jni/mupen64plus-video-gliden64/projects/msvc12/libGLideNHQ.vcxproj
  7. +0 −3 jni/mupen64plus-video-gliden64/projects/msvc12/libGLideNHQ.vcxproj.filters
  8. +84 −0 jni/mupen64plus-video-gliden64/projects/msvc12/osal.vcxproj
  9. +23 −0 jni/mupen64plus-video-gliden64/projects/msvc12/osal.vcxproj.filters
  10. +7 −5 jni/mupen64plus-video-gliden64/src/CMakeLists.txt
  11. +172 −2 jni/mupen64plus-video-gliden64/src/Combiner.cpp
  12. +9 −1 jni/mupen64plus-video-gliden64/src/Combiner.h
  13. +1 −0 jni/mupen64plus-video-gliden64/src/Config.cpp
  14. +3 −1 jni/mupen64plus-video-gliden64/src/Config.h
  15. +7 −0 jni/mupen64plus-video-gliden64/src/GLSLCombiner.h
  16. +2 −4 jni/mupen64plus-video-gliden64/src/GLideNHQ/CMakeLists.txt
  17. +1 −1 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxCache.cpp
  18. +1 −1 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxFilter.cpp
  19. +1 −1 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxHiResCache.cpp
  20. +1 −1 jni/mupen64plus-video-gliden64/src/GLideNHQ/TxTexCache.cpp
  21. 0 jni/mupen64plus-video-gliden64/src/GLideNHQ/{osal → }/txWidestringWrapper.cpp
  22. 0 jni/mupen64plus-video-gliden64/src/GLideNHQ/{osal → }/txWidestringWrapper.h
  23. +2 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/ConfigDialog.cpp
  24. +2 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/Settings.cpp
  25. +10 −0 jni/mupen64plus-video-gliden64/src/GLideNUI/configDialog.ui
  26. +62 −0 jni/mupen64plus-video-gliden64/src/OGL3X/GLSLCombiner_ogl3x.cpp
  27. +27 −2 jni/mupen64plus-video-gliden64/src/OpenGL.cpp
  28. +7 −0 jni/mupen64plus-video-gliden64/src/OpenGL.h
  29. +1 −1 jni/mupen64plus-video-gliden64/src/Revision.h
  30. +32 −20 jni/mupen64plus-video-gliden64/src/Textures.cpp
  31. +5 −2 jni/mupen64plus-video-gliden64/src/Textures.h
  32. +2 −0 jni/mupen64plus-video-gliden64/src/UniformCollection.h
  33. +3 −0 jni/mupen64plus-video-gliden64/src/mupenplus/Config_mupenplus.cpp
  34. +53 −0 jni/mupen64plus-video-gliden64/src/osal/CMakeLists.txt
  35. +23 −13 jni/mupen64plus-video-gliden64/src/{GLideNHQ → }/osal/osal_files.h
  36. +14 −7 jni/mupen64plus-video-gliden64/src/{GLideNHQ → }/osal/osal_files_unix.c
  37. +15 −7 jni/mupen64plus-video-gliden64/src/{GLideNHQ → }/osal/osal_files_win32.c
  38. +4 −0 jni/mupen64plus-video-gliden64/src/windows/GLFunctions.h
  39. +8 −0 jni/mupen64plus-video-gliden64/src/windows/GLFunctions_windows.cpp
  40. +3 −4 jni/mupen64plus-video-glidenhq.mk
  41. +28 −0 jni/mupen64plus-video-osal.mk
  42. +4 −0 res/xml/profile_emulation.xml
  43. +2 −1 src/paulscode/android/mupen64plusae/jni/NativeConfigFiles.java
  44. +2 −0 src/paulscode/android/mupen64plusae/profile/EmulationProfileActivity.java
View
@@ -31,6 +31,7 @@ include $(JNI_LOCAL_PATH)/mupen64plus-input-android/Android.mk
include $(JNI_LOCAL_PATH)/xperia-touchpad/Android.mk
include $(JNI_LOCAL_PATH)/mupen64plus-rsp-hle.mk
include $(JNI_LOCAL_PATH)/mupen64plus-ui-console.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-osal.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-glidenhq.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-gliden64.mk
include $(JNI_LOCAL_PATH)/mupen64plus-video-glide64mk2.mk
@@ -7,14 +7,15 @@ SRCDIR := ./mupen64plus-video-gliden64/src
MY_LOCAL_MODULE := mupen64plus-video-gliden64
MY_LOCAL_SHARED_LIBRARIES := freetype
MY_LOCAL_STATIC_LIBRARIES := glidenhq
MY_LOCAL_STATIC_LIBRARIES := glidenhq osal
MY_LOCAL_ARM_MODE := arm
MY_LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/$(SRCDIR) \
$(M64P_API_INCLUDES) \
$(SDL_INCLUDES) \
$(FREETYPE_INCLUDES) \
$(LOCAL_PATH)/$(SRCDIR)/osal \
MY_LOCAL_SRC_FILES := \
$(SRCDIR)/3DMath.cpp \
@@ -25,7 +25,7 @@ enableCustomSettings=1
[frameBufferEmulation]
enable=1
copyToRDRAM=1
copyDepthToRDRAM=1
copyDepthToRDRAM=0
copyFromRDRAM=0
detectCFB=0
N64DepthCompare=0
@@ -5,11 +5,14 @@ VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideN64", "GLideN64.vcxproj", "{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}"
ProjectSection(ProjectDependencies) = postProject
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C} = {7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756} = {DA965BCF-2219-47AF-ACE7-EAF76D5D4756}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLideNHQ", "libGLideNHQ.vcxproj", "{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osal", "osal.vcxproj", "{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_mupenplus|Win32 = Debug_mupenplus|Win32
@@ -49,6 +52,20 @@ Global
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|Win32.Build.0 = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug_mupenplus|Win32.Build.0 = Debug|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug|Win32.ActiveCfg = Debug|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Debug|Win32.Build.0 = Debug|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.MinSizeRel|Win32.ActiveCfg = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.MinSizeRel|Win32.Build.0 = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_dll|Win32.ActiveCfg = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_dll|Win32.Build.0 = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|Win32.ActiveCfg = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|Win32.Build.0 = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|Win32.ActiveCfg = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|Win32.Build.0 = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.RelWithDebInfo|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -111,10 +111,10 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<ExceptionHandling>Async</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/inc;../../../freetype/include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/inc;../../src/osal;../../../freetype/include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>freetype253MT_D.lib;..\..\src\GLideNUI\debug\GLideNUI.lib;GLideNHQ\Debug\libGLideNHQ.lib;opengl32.lib;glu32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>freetype253MT_D.lib;..\..\src\GLideNUI\debug\GLideNUI.lib;osal\Debug\osal.lib;GLideNHQ\Debug\libGLideNHQ.lib;opengl32.lib;glu32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>c:\Games\N64\Plugin\GLideN64.dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)New glNintendo64().pdb</ProgramDatabaseFile>
@@ -136,12 +136,12 @@
<PrecompiledHeaderFile>glN64.h</PrecompiledHeaderFile>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>../../src/inc;../../../freetype/include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/inc;../../src/osal;../../../freetype/include</AdditionalIncludeDirectories>
<ExceptionHandling>Async</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>freetype253MT_D.lib;GLideNHQ\Debug\libGLideNHQ.lib;opengl32.lib;glu32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>freetype253MT_D.lib;osal\Debug\osal.lib;GLideNHQ\Debug\libGLideNHQ.lib;opengl32.lib;glu32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>c:\Games\N64\M64Py\mupen64plus-video-GLideN64.dll </OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)New glNintendo64().pdb</ProgramDatabaseFile>
@@ -168,10 +168,10 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<ExceptionHandling>Async</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AdditionalIncludeDirectories>../../src/inc;../../../freetype/include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/inc;../../src/osal;../../../freetype/include</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>freetype253MT.lib;..\..\src\GLideNUI\release\GLideNUI.lib;GLideNHQ\Release\libGLideNHQ.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>freetype253MT.lib;..\..\src\GLideNUI\release\GLideNUI.lib;osal\Release\osal.lib;GLideNHQ\Release\libGLideNHQ.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>c:\Games\N64\Plugin\GLideN64.dll</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -197,12 +197,12 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>../../src/inc;../../../freetype/include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>../../src/inc;../../src/osal;../../../freetype/include</AdditionalIncludeDirectories>
<ExceptionHandling>Async</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>freetype253MT.lib;GLideNHQ\Release\libGLideNHQ.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>freetype253MT.lib;osal\Release\osal.lib;GLideNHQ\Release\libGLideNHQ.lib;opengl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>c:\Games\N64\M64Py\mupen64plus-video-GLideN64.dll</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
@@ -96,7 +96,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\src\inc;..\..\src\GLideNHQ\osal;..\..\src\GLideNHQ\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\src\inc;..\..\src\osal;..\..\src\GLideNHQ\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Debug/</AssemblerListingLocation>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<CompileAs>CompileAsCpp</CompileAs>
@@ -133,7 +133,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\src\inc;..\..\src\GLideNHQ\osal;..\..\src\GLideNHQ\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\src\inc;..\..\src\osal;..\..\src\GLideNHQ\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
@@ -145,7 +145,7 @@
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>
</DebugInformationFormat>
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;WIN32;OS_WINDOWS;_CRT_SECURE_NO_WARNINGS;DEBUG;__MSC__;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;OS_WINDOWS;_CRT_SECURE_NO_WARNINGS;__MSC__;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
@@ -269,7 +269,6 @@
</Midl>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\src\GLideNHQ\osal\osal_files_win32.c" />
<ClCompile Include="..\..\src\GLideNHQ\TextureFilters.cpp" />
<ClCompile Include="..\..\src\GLideNHQ\TextureFilters_2xsai.cpp" />
<ClCompile Include="..\..\src\GLideNHQ\TextureFilters_hq2x.cpp" />
@@ -46,9 +46,6 @@
<ClCompile Include="..\..\src\GLideNHQ\TextureFilters.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\GLideNHQ\osal\osal_files_win32.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Source Files">
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}</ProjectGuid>
<RootNamespace>osal</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)osal\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)osal\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;UNICODE;OS_WINDOWS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;UNICODE;OS_WINDOWS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\src\osal\osal_files.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\osal\osal_files_win32.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\osal\osal_files.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\osal\osal_files_win32.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
@@ -80,7 +80,9 @@ else(MUPENPLUSAPI)
set(GLideN64_DLL_NAME GLideN64)
endif(MUPENPLUSAPI)
add_subdirectory(GLideNHQ)
add_subdirectory( osal )
include_directories( osal )
add_subdirectory( GLideNHQ )
include_directories( GLideNHQ )
if(UNIX)
@@ -192,9 +194,9 @@ if( CMAKE_BUILD_TYPE STREQUAL "Debug")
)
if(SDL)
target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} GLideNHQd )
target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} osald GLideNHQd )
else(SDL)
target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} GLideNHQd )
target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} osald GLideNHQd )
endif(SDL)
endif( CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -208,9 +210,9 @@ if( CMAKE_BUILD_TYPE STREQUAL "Release")
)
if(SDL)
target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} GLideNHQ )
target_link_libraries(${GLideN64_DLL_NAME} ${OPENGL_LIBRARIES} ${SDL_LIBRARIES} ${FREETYPE_LIBRARIES} osal GLideNHQ )
else(SDL)
target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} GLideNHQ )
target_link_libraries(${GLideN64_DLL_NAME} PRIVATE ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} osal GLideNHQ )
endif(SDL)
endif( CMAKE_BUILD_TYPE STREQUAL "Release")
Oops, something went wrong.

0 comments on commit 52ffc03

Please sign in to comment.