Ver Fonte

minor hxsdl fixes

Nicolas Cannasse há 10 anos atrás
pai
commit
266ed772f5

+ 1 - 1
hxd/impl/Float32.hx

@@ -1,3 +1,3 @@
 package hxd.impl;
 
-typedef Float32 = #if (hxsdl && !macro) cpp.Float32 #else Float #end;
+typedef Float32 = #if cpp cpp.Float32 #else Float #end;

+ 1 - 1
hxd/impl/UInt16.hx

@@ -1,3 +1,3 @@
 package hxd.impl;
 
-typedef UInt16 = #if (hxsdl && !macro) cpp.UInt16 #else Int #end;
+typedef UInt16 = #if cpp cpp.UInt16 #else Int #end;

+ 1 - 1
hxd/res/Image.hx

@@ -5,7 +5,7 @@ class Image extends Resource {
 	/**
 		Specify if we will automatically convert non-power-of-two textures to power-of-two.
 	**/
-	public static var ALLOW_NPOT = #if flash11_8 true #else false #end;
+	public static var ALLOW_NPOT = #if (flash && !flash11_8) false #else true #end;
 	public static var DEFAULT_FILTER : h3d.mat.Data.Filter = Linear;
 
 	var tex : h3d.mat.Texture;

+ 1 - 2
samples/lights/lights.hxml

@@ -14,5 +14,4 @@
 -dce full
 -main Main
 -lib heaps
--lib nme
---remap flash:nme
+-lib hxsdl

+ 1 - 1
samples/lights/lights.hxproj

@@ -24,7 +24,7 @@
     <option noInlineOnDebug="False" />
     <option mainClass="Main" />
     <option enabledebug="False" />
-    <option additional="-lib heaps&#xA;-dce full&#xA;&#xA;--next&#xA;-swf lights.swf&#xA;-swf-version 11.8&#xA;-swf-header 1280:1024:60&#xA;-dce full&#xA;-main Main&#xA;-lib heaps&#xA;&#xA;--next&#xA;-cpp bin&#xA;-dce full&#xA;-main Main&#xA;-lib heaps&#xA;-lib nme&#xA;--remap flash:nme" />
+    <option additional="-lib heaps&#xA;-dce full&#xA;&#xA;--next&#xA;-swf lights.swf&#xA;-swf-version 11.8&#xA;-swf-header 1280:1024:60&#xA;-dce full&#xA;-main Main&#xA;-lib heaps&#xA;&#xA;--next&#xA;-cpp bin&#xA;-dce full&#xA;-main Main&#xA;-lib heaps&#xA;-lib hxsdl" />
   </build>
   <!-- haxelib libraries -->
   <haxelib>

+ 1 - 2
samples/skin/skin.hxml

@@ -13,5 +13,4 @@
 -cpp bin
 -main Main
 -lib heaps
--lib nme
---remap flash:nme
+-lib hxsdl

+ 1 - 1
samples/skin/skin.hxproj

@@ -24,7 +24,7 @@
     <option noInlineOnDebug="False" />
     <option mainClass="Main" />
     <option enabledebug="False" />
-    <option additional="-lib heaps&#xA;-dce full&#xA;&#xA;--next&#xA;-swf skin.swf&#xA;-swf-version 11.8&#xA;-swf-header 1280:900:60&#xA;-main Main&#xA;-lib heaps&#xA;-dce full&#xA;&#xA;--next&#xA;-cpp bin&#xA;-main Main&#xA;-lib heaps&#xA;-lib nme&#xA;--remap flash:nme" />
+    <option additional="-lib heaps&#xA;-dce full&#xA;&#xA;--next&#xA;-swf skin.swf&#xA;-swf-version 11.8&#xA;-swf-header 1280:900:60&#xA;-main Main&#xA;-lib heaps&#xA;-dce full&#xA;&#xA;--next&#xA;-cpp bin&#xA;-main Main&#xA;-lib heaps&#xA;-lib hxsdl" />
   </build>
   <!-- haxelib libraries -->
   <haxelib>