rename gui to nsfplay, will recreate gui as a common library for stand-alone + plugin

Author: bbbradsmith

gui/makefile

@@ -1,8 +1,8 @@
 include makefile.common
 
-.PHONY: default core cmd gui winamp install uninstall clean
+.PHONY: default core cmd gui nsfplay winamp install uninstall clean
 
-default: core cmd gui
+default: core cmd nsfplay
 
 ifeq ($(OS),Windows_NT)
 default: winamp
@@ -17,16 +17,19 @@ cmd: core
 gui: core
 	$(MAKE) -C gui
 
+nsfplay: core
+	$(MAKE) -C nsfplay
+
 winamp: core
 	$(MAKE) -C winamp
 
 install: cmd
 	$(MAKE) -C cmd install
-	$(MAKE) -C gui install
+	$(MAKE) -C nsfplay install
 
 uninstall:
 	$(MAKE) -C cmd uninstall
-	$(MAKE) -C gui uninstall
+	$(MAKE) -C nsfplay uninstall
 
 clean:
 	rm -rf $(INTDIR)

makefile

@@ -11,6 +11,7 @@ CXXFLAGS += -I../include -O3 -Wall -Werror -g
 LDFLAGS += -Wl,--fatal-warnings -g
 LDFLAGS_CMD += 
 LDFLAGS_GUI += 
+LDFLAGS_NSFPLAY += 
 LDFLAGS_DLL += 
 
 LIB_SUFFIX ?= .a
@@ -19,7 +20,8 @@ DLL_SUFFIX ?= .dll
 
 LIB_NAME ?= nsfcore
 CMD_NAME ?= nsfplac
-GUI_NAME ?= nsfplay
+GUI_NAME ?= nsfgui
+NSFPLAY_NAME ?= nsfplay
 WINAMP_NAME ?= nsfplay
 
 STRIP_DEBUG = \
@@ -31,6 +33,6 @@ ifeq ($(OS),Windows_NT)
 CXXFLAGS += -municode
 LDFLAGS += -static-libgcc
 LDFLAGS_CMD += -mconsole
-LDFLAGS_GUI += -municode -mwindows
+LDFLAGS_NSFPLAY += -municode -mwindows
 LDFLAGS_DLL += -municode -mdll
 endif

makefile.common

@@ -15,7 +15,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winamp", "winamp\winamp.vcx
 		{E492BA81-E2F5-439C-B42E-A3E26C82DDFB} = {E492BA81-E2F5-439C-B42E-A3E26C82DDFB}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui", "gui\gui.vcxproj", "{D3EC4B41-9124-4C7E-B2B8-01E85EEC750D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nsfplay", "nsfplay\nsfplay.vcxproj", "{D3EC4B41-9124-4C7E-B2B8-01E85EEC750D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E492BA81-E2F5-439C-B42E-A3E26C82DDFB} = {E492BA81-E2F5-439C-B42E-A3E26C82DDFB}
 	EndProjectSection

nsfplay.sln

@@ -0,0 +1,54 @@
+include ../makefile.common
+
+TARGETFILE ?= $(NSFPLAY_NAME)$(EXE_SUFFIX)
+TARGET ?= ../$(OUTDIR)/$(TARGETFILE)
+NSFPLAY_INTDIR ?= ../$(INTDIR)/nsfplay
+NSFPLAY_INSTALL = $(prefix)/$(TARGETFILE)
+
+.PHONY: default install uninstall clean
+
+default: $(TARGET)
+
+SRCS = $(wildcard *.cpp)
+OBJS = $(addprefix $(NSFPLAY_INTDIR)/,$(SRCS:.cpp=.o))
+DEPS = $(addprefix $(NSFPLAY_INTDIR)/,$(SRCS:.cpp=.d))
+CORE = ../$(OUTDIR)/$(LIB_NAME)$(LIB_SUFFIX)
+
+ifeq ($(OS),Windows_NT)
+OBJS += $(NSFPLAY_INTDIR)/nsfplay_rc.o
+endif
+
+$(TARGET): $(OBJS) $(CORE) | $(dir $(TARGET))
+	$(CXX) -o $(TARGET) $(LDFLAGS) $(LDFLAGS_NSFPLAY) $(OBJS) $(CORE)
+	$(STRIP_DEBUG)
+
+$(NSFPLAY_INTDIR)/%.d: %.cpp | $(NSFPLAY_INTDIR)/
+	$(CXX) -M -MM -MF $@ -MT $(NSFPLAY_INTDIR)/$(basename $<).o $(CXXFLAGS) -c $<
+
+$(NSFPLAY_INTDIR)/%.o: %.cpp $(NSFPLAY_INTDIR)/%.d | $(NSFPLAY_INTDIR)/
+	$(CXX) -o $@ $(CXXFLAGS) -c $<
+
+$(NSFPLAY_INTDIR)/nsfplay_rc.o: nsfplay.rc *.ico | $(NSFPLAY_INTDIR)/
+	windres -i $< -o $@
+
+$(NSFPLAY_INTDIR)/:
+	$(MKDIR) $@
+
+$(dir $(TARGET)):
+	$(MKDIR) $@
+
+$(CORE):
+	$(MAKE) -C ../core
+
+install: $(TARGET)
+	$(MKDIR) $(dir $(NSFPLAY_INSTALL))
+	cp $(TARGET) $(NSFPLAY_INSTALL)
+
+uninstall:
+	rm -f $(NSFPLAY_INSTALL)
+
+clean:
+	rm -rf $(NSFPLAY_INTDIR)
+	rm -rf $(dir $(TARGET))
+
+include $(DEPS)

nsfplay/makefile

@@ -22,8 +22,9 @@
     <VCProjectVersion>16.0</VCProjectVersion>
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{d3ec4b41-9124-4c7e-b2b8-01e85eec750d}</ProjectGuid>
-    <RootNamespace>gui</RootNamespace>
+    <RootNamespace>nsfplay</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>nsfplay</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -170,10 +171,10 @@
     <ClInclude Include="resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="gui.cpp" />
+    <ClCompile Include="nsfplay.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="gui.rc" />
+    <ResourceCompile Include="nsfplay.rc" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="nsfplay.ico" />

gui/gui.cpp renamed to nsfplay/nsfplay.cpp

@@ -20,12 +20,12 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="gui.cpp">
+    <ClCompile Include="nsfplay.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="gui.rc">
+    <ResourceCompile Include="nsfplay.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>

gui/nsfplay.ico renamed to nsfplay/nsfplay.ico

@@ -13,11 +13,12 @@ Make targets:
 * `make clean` - deletes `intermediate` and `output` directories.
 * `make core` - build core library `nsfcore` to `output/make`.
 * `make cmd` - build `nsfplac` to `output/make`.
-* `make gui` - build `nsfplay` to `output/make`.
+* `make gui` - build gui library `nsfgui` to `output/make`.
+* `make nsfplay` - build `nsfplay` to `output/make`.
 * `make winamp` - (windows only) build `nsfplay.dll` winamp plugin to `output/make`.
 * `make install` - copy `nsfplay`/`nsfplaycmd` to `/usr/local/bin`.
 * `make uninstall` - delete install from `/usr/local/bin`.
 * `make install prefix=~/my/directory` - install to custom directory.
 * `make uninstall prefix=~/my/directory` - uninstall from custom directory.
 
-See `makefile.common` for various potential environment overrides.
+See `makefile.common` for various potential environment overrides.