Skip to content

Commit a27b061

Browse files
committed
change launcher to use lib folder, update dir structure
1 parent 791c2db commit a27b061

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

build/windows/export/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ AOBJS = launcher.o
99

1010
application.exe: $(AOBJS)
1111
$(LINK.cc) $(CXXFLAGS) -DEXPORT -o $@ $(AOBJS)
12-
cp application.exe ../work/lib/export/
13-
cp application.exe ../../shared/lib/export/
12+
cp application.exe ../work/modes/java/application/template.exe
13+
cp application.exe ../../../java/application/template.exe
1414

1515
$(POBJS): Makefile
1616

7.71 KB
Binary file not shown.

build/windows/export/launcher.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,9 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
282282
strcat(outgoing_cmd_line, " ");
283283

284284
// for 2.0a2, add the 'lib' folder to the java.library.path
285-
strcat(outgoing_cmd_line, "-Djava.library.path=");
285+
strcat(outgoing_cmd_line, "\"-Djava.library.path=");
286286
strcat(outgoing_cmd_line, exe_directory);
287-
strcat(outgoing_cmd_line, "\\lib ");
287+
strcat(outgoing_cmd_line, "\\lib\" ");
288288

289289
// add the name of the class to execute and a space before the next arg
290290
strcat(outgoing_cmd_line, java_main_class);
@@ -310,6 +310,8 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
310310

311311
SHELLEXECUTEINFO ShExecInfo;
312312

313+
//MessageBox(NULL, executable, outgoing_cmd_line, MB_OK);
314+
313315
// set up the execution info
314316
ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
315317
ShExecInfo.fMask = 0;
@@ -328,7 +330,6 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow)
328330
}
329331

330332
if (reinterpret_cast<int>(ShExecInfo.hInstApp) <= 32) {
331-
332333
// some type of error occurred
333334
switch (reinterpret_cast<int>(ShExecInfo.hInstApp)) {
334335
case ERROR_FILE_NOT_FOUND:

java/application/template.exe

7.71 KB
Binary file not shown.

0 commit comments

Comments
 (0)