Skip to content

Commit c896b39

Browse files
committed
Windows compilation fix, hide page on linux
windows.vcxproj ~ use globals.h instead of globals.cpp interface_derived.cpp + on linux, remove Learn tab since that feature is not available
1 parent 48fecb4 commit c896b39

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

source/interface_derived.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
8585
//if no projects to load, the interface will be blank
8686

8787
#if defined __APPLE || defined _WIN32
88-
timeout = new wxTimer(this,TIMER);
88+
timeout = new wxTimer(this, TIMER);
89+
90+
#elif defined __linux__
91+
//hide the learn tab on Linux
92+
notebook->DeletePage(notebook->GetPageCount() - 1);
8993
#endif
9094
//show current version in titlebar
9195
this->SetLabel("Unity Hub Native " + AppVersion);

windows.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@
162162
</ItemDefinitionGroup>
163163
<ItemGroup>
164164
<ClCompile Include="source\create_dialog_derived.cpp" />
165-
<ClCompile Include="source\globals.cpp" />
166165
<ClCompile Include="source\interface.cpp" />
167166
<ClCompile Include="source\interface_derived.cpp" />
168167
<ClCompile Include="source\main.cpp" />
@@ -171,6 +170,7 @@
171170
<ItemGroup>
172171
<ClInclude Include="resource.h" />
173172
<ClInclude Include="source\dirent.h" />
173+
<ClInclude Include="source\globals.h" />
174174
<ClInclude Include="source\interface.h" />
175175
<ClInclude Include="source\interface_derived.hpp" />
176176
</ItemGroup>

windows.vcxproj.filters

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
<ClCompile Include="source\interface_derived.cpp">
2525
<Filter>Source Files</Filter>
2626
</ClCompile>
27-
<ClCompile Include="source\globals.cpp">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
3027
<ClCompile Include="source\create_dialog_derived.cpp">
3128
<Filter>Source Files</Filter>
3229
</ClCompile>
@@ -47,6 +44,9 @@
4744
<ClInclude Include="source\interface.h">
4845
<Filter>Header Files</Filter>
4946
</ClInclude>
47+
<ClInclude Include="source\globals.h">
48+
<Filter>Header Files</Filter>
49+
</ClInclude>
5050
</ItemGroup>
5151
<ItemGroup>
5252
<ResourceCompile Include="windows.rc">

0 commit comments

Comments
 (0)