diff --git a/.gitignore b/.gitignore index 5c39210..cb455ca 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ bin/ *Darwin.* install_manifest.txt +obj/ *.dis *.o *.dylib diff --git a/HelloWorld.make b/CppCmds.make similarity index 98% rename from HelloWorld.make rename to CppCmds.make index 0112dc7..1c39a46 100644 --- a/HelloWorld.make +++ b/CppCmds.make @@ -13,7 +13,7 @@ endif ifeq ($(config),debug) RESCOMP = windres TARGETDIR = bin/Debug - TARGET = $(TARGETDIR)/HelloWorld + TARGET = $(TARGETDIR)/CppCmds OBJDIR = obj/Debug DEFINES += -DDEBUG -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ INCLUDES += -I/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.0 -I/usr/include/wx-3.0 @@ -40,7 +40,7 @@ endif ifeq ($(config),release) RESCOMP = windres TARGETDIR = bin/Release - TARGET = $(TARGETDIR)/HelloWorld + TARGET = $(TARGETDIR)/CppCmds OBJDIR = obj/Release DEFINES += -DNDEBUG -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ INCLUDES += -I/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.0 -I/usr/include/wx-3.0 @@ -99,7 +99,7 @@ ifeq (.exe,$(findstring .exe,$(ComSpec))) endif $(TARGET): $(GCH) ${CUSTOMFILES} $(OBJECTS) $(LDDEPS) $(RESOURCES) | $(TARGETDIR) - @echo Linking HelloWorld + @echo Linking CppCmds $(SILENT) $(LINKCMD) $(POSTBUILDCMDS) @@ -122,7 +122,7 @@ else endif clean: - @echo Cleaning HelloWorld + @echo Cleaning CppCmds ifeq (posix,$(SHELLTYPE)) $(SILENT) rm -f $(TARGET) $(SILENT) rm -rf $(OBJDIR) diff --git a/premake5.lua b/premake5.lua index 571442c..c35ea14 100644 --- a/premake5.lua +++ b/premake5.lua @@ -2,7 +2,7 @@ workspace "CppLib" configurations {"Debug", "Release" } system "linux" -project "HelloWorld" +project "CppCmds" kind "ConsoleApp" language "c++" targetdir "bin/%{cfg.buildcfg}"