Skip to content

Commit

Permalink
More linux fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkulp
dkulp committed Jan 15, 2024
1 parent 16bcfe6 commit da1921b
Show file tree
Hide file tree
Showing 7 changed files with 1,142 additions and 1,114 deletions.
1,396 changes: 701 additions & 695 deletions xLights/xLights.cbp.mak
View file

Large diffs are not rendered by default.

94 changes: 50 additions & 44 deletions xScanner/xScanner.cbp.mak
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions xSchedule/RemoteFalcon/RemoteFalcon.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@
<Unit filename="../../common/xlBaseApp.cpp" />
<Unit filename="../../common/xlBaseApp.h" />
<Unit filename="../../common/xlStackWalker.h" />
<Unit filename="../../SpecialOptions.cpp" />
<Unit filename="../../SpecialOptions.h" />
<Unit filename="../../xLights/SpecialOptions.cpp" />
<Unit filename="../../xLights/SpecialOptions.h" />
<Unit filename="../../xLights/UtilFunctions.cpp" />
<Unit filename="../../xLights/UtilFunctions.h" />
<Unit filename="../../xLights/xLightsTimer.cpp" />
Expand Down
18 changes: 12 additions & 6 deletions xSchedule/RemoteFalcon/RemoteFalcon.cbp.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ OBJDIR_LINUX_RELEASE = .objs_lr
DEP_LINUX_RELEASE =
OUT_LINUX_RELEASE = ../../bin/RemoteFalcon.so

OBJ_LINUX_DEBUG = $(OBJDIR_LINUX_DEBUG)/RemoteFalconSettingsDialog.o $(OBJDIR_LINUX_DEBUG)/RemoteFalconOptions.o $(OBJDIR_LINUX_DEBUG)/RemoteFalconMain.o $(OBJDIR_LINUX_DEBUG)/RemoteFalconApp.o $(OBJDIR_LINUX_DEBUG)/__/__/common/xlBaseApp.o $(OBJDIR_LINUX_DEBUG)/__/wxJSON/jsonval.o $(OBJDIR_LINUX_DEBUG)/__/wxJSON/jsonreader.o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/xLightsVersion.o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/xLightsTimer.o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/UtilFunctions.o
OBJ_LINUX_DEBUG = $(OBJDIR_LINUX_DEBUG)/RemoteFalconSettingsDialog.o $(OBJDIR_LINUX_DEBUG)/RemoteFalconOptions.o $(OBJDIR_LINUX_DEBUG)/RemoteFalconMain.o $(OBJDIR_LINUX_DEBUG)/RemoteFalconApp.o $(OBJDIR_LINUX_DEBUG)/__/__/common/xlBaseApp.o $(OBJDIR_LINUX_DEBUG)/__/wxJSON/jsonval.o $(OBJDIR_LINUX_DEBUG)/__/wxJSON/jsonreader.o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/xLightsVersion.o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/xLightsTimer.o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/UtilFunctions.o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/SpecialOptions.o

OBJ_LINUX_RELEASE = $(OBJDIR_LINUX_RELEASE)/RemoteFalconSettingsDialog.o $(OBJDIR_LINUX_RELEASE)/RemoteFalconOptions.o $(OBJDIR_LINUX_RELEASE)/RemoteFalconMain.o $(OBJDIR_LINUX_RELEASE)/RemoteFalconApp.o $(OBJDIR_LINUX_RELEASE)/__/__/common/xlBaseApp.o $(OBJDIR_LINUX_RELEASE)/__/wxJSON/jsonval.o $(OBJDIR_LINUX_RELEASE)/__/wxJSON/jsonreader.o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/xLightsVersion.o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/xLightsTimer.o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/UtilFunctions.o
OBJ_LINUX_RELEASE = $(OBJDIR_LINUX_RELEASE)/RemoteFalconSettingsDialog.o $(OBJDIR_LINUX_RELEASE)/RemoteFalconOptions.o $(OBJDIR_LINUX_RELEASE)/RemoteFalconMain.o $(OBJDIR_LINUX_RELEASE)/RemoteFalconApp.o $(OBJDIR_LINUX_RELEASE)/__/__/common/xlBaseApp.o $(OBJDIR_LINUX_RELEASE)/__/wxJSON/jsonval.o $(OBJDIR_LINUX_RELEASE)/__/wxJSON/jsonreader.o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/xLightsVersion.o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/xLightsTimer.o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/UtilFunctions.o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/SpecialOptions.o

all: linux_debug linux_release

Expand Down Expand Up @@ -92,6 +92,9 @@ $(OBJDIR_LINUX_DEBUG)/__/__/xLights/xLightsTimer.o: ../../xLights/xLightsTimer.c
$(OBJDIR_LINUX_DEBUG)/__/__/xLights/UtilFunctions.o: ../../xLights/UtilFunctions.cpp
$(CXX) $(CFLAGS_LINUX_DEBUG) $(INC_LINUX_DEBUG) -c ../../xLights/UtilFunctions.cpp -o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/UtilFunctions.o

$(OBJDIR_LINUX_DEBUG)/__/__/xLights/SpecialOptions.o: ../../xLights/SpecialOptions.cpp
$(CXX) $(CFLAGS_LINUX_DEBUG) $(INC_LINUX_DEBUG) -c ../../xLights/SpecialOptions.cpp -o $(OBJDIR_LINUX_DEBUG)/__/__/xLights/SpecialOptions.o

clean_linux_debug:
rm -f $(OBJ_LINUX_DEBUG) $(OUT_LINUX_DEBUG)

Expand Down Expand Up @@ -139,6 +142,9 @@ $(OBJDIR_LINUX_RELEASE)/__/__/xLights/xLightsTimer.o: ../../xLights/xLightsTimer
$(OBJDIR_LINUX_RELEASE)/__/__/xLights/UtilFunctions.o: ../../xLights/UtilFunctions.cpp
$(CXX) $(CFLAGS_LINUX_RELEASE) $(INC_LINUX_RELEASE) -c ../../xLights/UtilFunctions.cpp -o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/UtilFunctions.o

$(OBJDIR_LINUX_RELEASE)/__/__/xLights/SpecialOptions.o: ../../xLights/SpecialOptions.cpp
$(CXX) $(CFLAGS_LINUX_RELEASE) $(INC_LINUX_RELEASE) -c ../../xLights/SpecialOptions.cpp -o $(OBJDIR_LINUX_RELEASE)/__/__/xLights/SpecialOptions.o

clean_linux_release:
rm -f $(OBJ_LINUX_RELEASE) $(OUT_LINUX_RELEASE)

Expand All @@ -154,19 +160,19 @@ RemoteFalconMain.h: ../../xLights/xLightsTimer.h RemoteFalconOptions.h RemoteFal

RemoteFalcon.h: ../../xLights/UtilFunctions.h RemoteFalconOptions.h ../../xLights/SpecialOptions.h

../../xLights/SpecialOptions.h: ../../xLights/ExternalHooks.h

../../xLights/ExternalHooks.h: ../../xLights/Color.h

RemoteFalconApp.cpp: RemoteFalconMain.h RemoteFalconApp.h ../../xLights/xLightsVersion.h ../../xLights/SpecialOptions.h

../../common/xlBaseApp.cpp: ../../xLights/ExternalHooks.h ../../xLights/xLightsVersion.h

../../xLights/ExternalHooks.h: ../../xLights/Color.h

../../xLights/xLightsVersion.cpp: ../../xLights/xLightsVersion.h

../../xLights/xLightsTimer.cpp: ../../xLights/xLightsTimer.h

../../xLights/UtilFunctions.cpp: ../../xLights/UtilFunctions.h ../../xLights/xLightsVersion.h ../../xLights/ExternalHooks.h

../../xLights/SpecialOptions.cpp: ../../xLights/SpecialOptions.h ../../xLights/ExternalHooks.h ../../xLights/UtilFunctions.h

.PHONY: before_linux_debug after_linux_debug clean_linux_debug before_linux_release after_linux_release clean_linux_release

2 changes: 1 addition & 1 deletion xSchedule/xSMSDaemon/SMSMessage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class SMSMessage

wxString GetUIMessage() const
{
if (!wmessage.empty())
if (!_message.empty())

This comment has been minimized.

Sign in to view

Copy link
@merryoncherry

merryoncherry Jan 15, 2024

Contributor

This was supposed to be _wmessage
{
return wxString(_from) + ": " + wxString(_wmessage);
}
Expand Down
6 changes: 5 additions & 1 deletion xSchedule/xSMSDaemon/xSMSDaemonMain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,11 @@ bool xSMSDaemonFrame::SetText(const std::string& t, const std::string& text, con
{
s = std::wstring(text.begin(), text.end());
}
std::wstring p = t + "," + s + ",";
static std::wstring COMMA = {','};
std::wstring p(t.begin(), t.end());
p += COMMA;
p += s;
p += COMMA;
_action("Set current text", (const wchar_t*)p.c_str(), "", result, sizeof(result));
std::string res(result);

Expand Down
736 changes: 371 additions & 365 deletions xSchedule/xSchedule.cbp.mak
View file

Large diffs are not rendered by default.

0 comments on commit da1921b

Please sign in to comment.