Linux build fixes.

ronald132 · Feb 7, 2011 · 30957c9 · 30957c9
1 parent 67efbe9
commit 30957c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/libs/MAStd/GLES/gl.h b/libs/MAStd/GLES/gl.h
@@ -12,7 +12,7 @@ typedef union MA_FV MA_FV;
 #endif
 
 //typedef void* MAAddress;
-#include "IX_OPENGL_ES.H"
+#include "IX_OPENGL_ES.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/runtimes/cpp/platforms/sdl/mosynclib/workfile.rb b/runtimes/cpp/platforms/sdl/mosynclib/workfile.rb
@@ -17,8 +17,8 @@ class << work
 	@SPECIFIC_CFLAGS = {"main.cpp" => " -DMOSYNC_DLL_EXPORT -Wno-missing-noreturn",
 		"mosyncmain.cpp" => " -DMOSYNC_DLL_IMPORT"}
 	@WHOLE_LIBS = ["mosync_sdl"]
-	@LIBRARIES +=["OpenGL32", "GlU32", "Gdi32"]
 	if(HOST == :win32)
+		@LIBRARIES += ["OpenGL32", "GlU32", "Gdi32"]
 		@EXTRA_OBJECTS = [FileTask.new(self, "mosynclib.def")]
 	end
 

diff --git a/workfile.rb b/workfile.rb
@@ -10,10 +10,12 @@
 
 if(HOST == :win32) then
 	INTLIB_PLATFORM = "windows"
-	PLATFORM_TOOLS = ["tools/makesis-2.0.0", "tools/makesis-4", "tools/mifconv", "tools/rcomp", "tools/package", "tools/uidcrc"]
+	PLATFORM_TOOLS = ["tools/makesis-2.0.0", "tools/makesis-4", "tools/mifconv",
+		"tools/rcomp", "tools/package", "tools/uidcrc", "tools/MoSyncUpdater"]
 elsif(HOST == :darwin)
 	INTLIB_PLATFORM = "linux"
-	PLATFORM_TOOLS = ["tools/makesis-2.0.0_unix", "tools/makesis-4_unix", "tools/mifconv", "tools/rcomp", "tools/package", "tools/uidcrc"]
+	PLATFORM_TOOLS = ["tools/makesis-2.0.0_unix", "tools/makesis-4_unix",
+		"tools/mifconv", "tools/rcomp", "tools/package", "tools/uidcrc"]
 else
 	INTLIB_PLATFORM = HOST
 	# todo: add lcab
@@ -36,7 +38,7 @@
 PIPE_DIRS = ["tools/protobuild", "tools/pipe-tool", "tools/DefaultSkinGenerator", "libs"]
 EXAM_DIRS = PIPE_DIRS + ["tests/unitTest", "examples"]
 TOOL_DIRS = ["tools/debugger", "tools/FontGenerator", "tools/PanicDoc", "tools/Bundle",
-	"tests/unitTestServer", "tools/iphone-builder", "tools/icon-injector", "tools/e32hack", "tools/MoSyncUpdater"]
+	"tests/unitTestServer", "tools/iphone-builder", "tools/icon-injector", "tools/e32hack"]
 
 MAIN_DIRS = BASE_DIRS + TOOL_DIRS + PIPE_DIRS
 ALL_DIRS = MAIN_DIRS + EXAM_DIRS