--- uae/src/od-amiga/ami-appw.c	2018/04/24 16:40:30	1.1.1.1
+++ uae/src/od-amiga/ami-appw.c	2018/04/24 17:19:16	1.1.1.4
@@ -1,8 +1,8 @@
- /* 
+ /*
   * UAE - The Un*x Amiga Emulator
-  * 
+  *
   * AppWindow interface
-  * 
+  *
   * Copyright 1997 Samuel Devulder.
   */
 
@@ -15,10 +15,29 @@
 
 #include <dos/dos.h>
 
+#if defined(POWERUP)
+#ifndef USE_CLIB
+#include <powerup/ppcproto/intuition.h>
+#include <powerup/ppcproto/exec.h>
+#include <powerup/ppcproto/dos.h>
+/*#include <workbench/workbench.h> sam: a effacer*/
+#include <powerup/ppcproto/wb.h>
+#else
+#include <clib/intuition_protos.h>
+#include <clib/exec_protos.h>
+#include <clib/dos_protos.h>
+#include <clib/wb_protos.h>
+#endif
+
+#define AddAppWindow(a0, a1, a2, a3, tags...) \
+	({ULONG _tags[] = { tags }; AddAppWindowA((a0), (a1), (a2), (a3), (struct TagItem *)_tags);})
+
+#else
 #include <proto/intuition.h>
 #include <proto/exec.h>
 #include <proto/dos.h>
 #include <proto/wb.h>
+#endif
 
 /****************************************************************************/
 
@@ -46,16 +65,16 @@ int appw_init(struct Window *W)
 {
     WorkbenchBase = (void*)OpenLibrary("workbench.library",36L);
     if(WorkbenchBase) {
-        AppPort = CreatePort(0,0);
-        if(AppPort) {
-            AppWin = AddAppWindow(0,0,W,AppPort,NULL);
-            if(AppWin) {
-                write_log("AppWindow started.\n");
-                return 1;
-            }
-        }
+	AppPort = CreatePort(0,0);
+	if(AppPort) {
+	    AppWin = AddAppWindow(0,0,W,AppPort,NULL);
+	    if(AppWin) {
+		write_log ("AppWindow started.\n");
+		return 1;
+	    }
+	}
     }
-    write_log("Failed to start AppWindow.\n");
+    write_log ("Failed to start AppWindow.\n");
 
     return 0;
 }
@@ -65,18 +84,18 @@ int appw_init(struct Window *W)
 void appw_exit(void)
 {
     if(AppPort) {
-        void *msg;
-        while((msg=GetMsg(AppPort))) ReplyMsg(msg);
-        DeletePort(AppPort);
-        AppPort = NULL;
+	void *msg;
+	while((msg=GetMsg(AppPort))) ReplyMsg(msg);
+	DeletePort(AppPort);
+	AppPort = NULL;
     }
     if(AppWin) {
-        RemoveAppWindow(AppWin);
-        AppWin = NULL;
+	RemoveAppWindow(AppWin);
+	AppWin = NULL;
     }
     if(WorkbenchBase) {
-        CloseLibrary((void*)WorkbenchBase);
-        WorkbenchBase = NULL;
+	CloseLibrary((void*)WorkbenchBase);
+	WorkbenchBase = NULL;
     }
 }
 
@@ -100,25 +119,25 @@ static void addcmd(char *cmd, int len, U
 void appw_events(void)
 {
     if(AppWin) {
-        struct AppMessage *msg;
-        struct WBArg *arg;
-        while((msg=(void*)GetMsg(AppPort))) {
-            char cmd[LEN];
-            int  i;
-
-            arg = msg->am_ArgList;
-
-            strcpy(cmd,"cd ");
-            NameFromLock(arg[0].wa_Lock,&cmd[3],LEN-3);
-            uaeexe(cmd);
-
-	    strcpy(cmd,"run ");strcpy(cmd+4,arg[0].wa_Name);
-            for(i=1;i<msg->am_NumArgs;++i)
-                addcmd(cmd,LEN-2,arg[i].wa_Lock,arg[i].wa_Name);
-                /*             ^        */
-                /* 2 bytes for security */
-            uaeexe(cmd);
-            ReplyMsg((void*)msg);
-        }
+	struct AppMessage *msg;
+	struct WBArg *arg;
+	while((msg=(void*)GetMsg(AppPort))) {
+	    char cmd[LEN];
+	    int  i;
+
+	    arg = msg->am_ArgList;
+
+	    strcpy(cmd,"cd ");
+	    NameFromLock(arg[0].wa_Lock,&cmd[3],LEN-3);
+	    if(!uaeexe(cmd)) {
+	       strcpy(cmd,"run ");strcpy(cmd+4,arg[0].wa_Name);
+	       for(i=1;i<msg->am_NumArgs;++i)
+		   addcmd(cmd,LEN-2,arg[i].wa_Lock,arg[i].wa_Name);
+		   /*             ^        */
+		   /* 2 bytes for security */
+	       uaeexe(cmd);
+	    }
+	    ReplyMsg((void*)msg);
+	}
     }
 }