Skip to content

Commit 8d14e37

Browse files
committed
minor fixes to build tools code for linux
1 parent fd5d4a6 commit 8d14e37

5 files changed

Lines changed: 5 additions & 3 deletions

File tree

prog/tools/sceneTools/daEditorX/de_aboutdlg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class AboutDlg
4343
class AboutDlg
4444
{
4545
public:
46-
AboutDlg(void *hwnd) {}
46+
AboutDlg(void *) {}
4747
~AboutDlg() {}
4848

4949
void show() {}

prog/tools/sceneTools/daEditorX/de_appwnd.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2627,6 +2627,7 @@ void DagorEdAppWindow::pluginHelp(const char *url) const
26272627

26282628
::HtmlHelp(NULL, help.str(), HH_DISPLAY_TOPIC, 0);
26292629
#else
2630+
G_UNUSED(url);
26302631
LOGERR_CTX("TODO: tools Linux porting: DagorEdAppWindow::pluginHelp");
26312632
#endif
26322633
}

prog/tools/sceneTools/daEditorX/jamfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Dependencies =
1313
$(Root)/$(Location)/IvyGen/jamfile
1414
$(Root)/$(Location)/Occluders/jamfile
1515
$(Root)/$(Location)/csg/jamfile
16-
$(Root)/$(Location)/GraphEditor/jamfile
1716
;
17+
if $(Platform) = windows { Dependencies += $(Root)/$(Location)/GraphEditor/jamfile ; }
1818

1919
local editor_jam = $(Root)/$(Location)/jamfile-editor ;
2020
platform on $(editor_jam:G=JAM) = -sPlatform=$(Platform) -sPlatformArch=$(PlatformArch) -sCPPStd=$(CPPStd) ;

prog/tools/sceneTools/daEditorX/jamfile-editor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ else if $(Platform) = linux {
233233
UseProgLibs +=
234234
engine/drv/hid_joystick_linux
235235
;
236+
dasStdDlg_UserProvidedPlatform = yes ;
236237
}
237238
else {
238239
Exit unsupported Platform\=$(Platform) for Target\=$(Target) ;

prog/tools/sceneTools/impostorBaker/impostorUtil/impostorVoxel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static bool texture_to_image(BaseTexture *texture, eastl::unique_ptr<Image, tmpm
250250
{
251251
G_ASSERT(texture);
252252
G_ASSERT(image);
253-
auto locked = lock_texture<const eastl::remove_pointer<decltype(image->getPixels())>::type>(texture, 0, TEXLOCK_READ);
253+
auto locked = lock_texture<const typename eastl::remove_pointer<decltype(image->getPixels())>::type>(texture, 0, TEXLOCK_READ);
254254
if (!bool(locked))
255255
return false;
256256
uint32_t w = locked.getWidthInElems();

0 commit comments

Comments
 (0)