Merge pull request #9 from afedchin/nseel2

Update to ns-eel2
xbmc · Dec 25, 2017 · 104a7a3 · 104a7a3
2 parents 9ddf9b1 + 45088c3
commit 104a7a3
Show file tree

Hide file tree

Showing 46 changed files with 13,238 additions and 3,213 deletions.
diff --git a/depends/windows/nasmw/CMakeLists.txt b/depends/windows/nasmw/CMakeLists.txt
@@ -0,0 +1,7 @@
+cmake_minimum_required(VERSION 2.8)
+project(nasmw)
+
+install(
+	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+	DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+)
diff --git a/depends/windows/nasmw/nasmw.txt b/depends/windows/nasmw/nasmw.txt
@@ -0,0 +1 @@
+nasmw http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip
diff --git a/lib/vis_milkdrop/CMakeLists.txt b/lib/vis_milkdrop/CMakeLists.txt
@@ -43,7 +43,7 @@ set(SOURCES dx11/CommonStates.cpp
             state.cpp
             support.cpp)
 
-add_subdirectory(evallib)
+add_subdirectory(ns-eel2)
 
 if(CORE_SYSTEM_NAME STREQUAL windowsstore)
   add_definitions(-D_WIN32_WINNT=0x0A00 -D_WINDOWS)
@@ -53,4 +53,4 @@ endif()
 remove_definitions(-D_USE_32BIT_TIME_T)
 add_library(vis_milkdrop STATIC ${SOURCES} ${SHADER_INCLUDES})
 
-target_link_libraries(vis_milkdrop evallib)
+target_link_libraries(vis_milkdrop ns-eel2)
diff --git a/lib/vis_milkdrop/evallib/CMakeLists.txt b/lib/vis_milkdrop/evallib/CMakeLists.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		nasmw http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win32/nasm-2.12.02-win32.zip