Merge pull request #38 from BtbN/master

Move CPack win32 generator from NSIS to WIX

obs/CMakeLists.txt

@@ -80,6 +80,19 @@ add_executable(obs WIN32
 	${obs_HEADERS}
 	${obs_UI_HEADERS}
 	${obs_QRC_SOURCES})
+
+if(WIN32)
+	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+		set(_output_suffix "64")
+	else()
+		set(_output_suffix "32")
+	endif()
+
+	set_target_properties(obs
+		PROPERTIES
+			OUTPUT_NAME "obs${_output_suffix}")
+endif()
+
 target_link_libraries(obs
 	libobs
 	Qt5::Widgets

obs/makefile.am

@@ -1,39 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-AM_CPPFLAGS = -I$(top_srcdir)/libobs
-
-if OS_WIN
-if ARCH_X86_64
-obsdir = ../build/bin/64bit
-else
-obsdir = ../build/bin/32bit
-endif
-else
-obsdir = $(bindir)
-endif
-
-obs_PROGRAMS = obs
-obs_LDADD = $(top_srcdir)/libobs/libobs.la
-obs_SOURCES = window-basic-main.cpp \
-	      window-basic-settings.cpp \
-	      window-namedialog.cpp \
-	      settings-basic.cpp \
-	      settings-basic-general.cpp \
-	      settings-basic-video.cpp \
-	      obs-app.cpp \
-	      wx-subclass.cpp \
-	      wx-wrappers.cpp \
-	      forms/OBSWindows.cpp
-
-if OS_WIN
-obs_SOURCES += platform-windows.cpp
-endif
-
-if OS_OSX
-obs_SOURCES += platform-osx.mm
-endif
-
-if OS_NIX
-obs_CPPFLAGS = $(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) $(XINERAMA_CFLAGS)
-obs_SOURCES += platform-x11.cpp
-obs_LDADD += $(GTK_LIBS) $(X11_LIBS) $(XINERAMA_LIBS)
-endif