aboutsummaryrefslogtreecommitdiff
path: root/depends/launcher/CMakeLists.txt
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-12 22:17:14 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-12 22:17:14 +0100
commitb589a12d1765f8df616779c53e614adef2e4c48e (patch)
tree83cdd87d532a36df1177987547c57058fd4f1777 /depends/launcher/CMakeLists.txt
parent498520446fcd10003226822f5ada9c2fe90e8c63 (diff)
parentfca4441229808891f460d5fbc4affd51e8896aa5 (diff)
downloadPrismLauncher-b589a12d1765f8df616779c53e614adef2e4c48e.tar.gz
PrismLauncher-b589a12d1765f8df616779c53e614adef2e4c48e.tar.bz2
PrismLauncher-b589a12d1765f8df616779c53e614adef2e4c48e.zip
Merge branch 'feature_better_launch' into develop
Diffstat (limited to 'depends/launcher/CMakeLists.txt')
-rw-r--r--depends/launcher/CMakeLists.txt25
1 files changed, 19 insertions, 6 deletions
diff --git a/depends/launcher/CMakeLists.txt b/depends/launcher/CMakeLists.txt
index 729ebb67..6af5f738 100644
--- a/depends/launcher/CMakeLists.txt
+++ b/depends/launcher/CMakeLists.txt
@@ -3,20 +3,33 @@ project(launcher Java)
find_package(Java 1.6 REQUIRED COMPONENTS Development)
include(UseJava)
-set(CMAKE_JAVA_JAR_ENTRY_POINT MultiMCLauncher)
+set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint)
set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
set(SRC
- MultiMCLauncher.java
+ # OSX things
org/simplericity/macify/eawt/Application.java
org/simplericity/macify/eawt/ApplicationAdapter.java
org/simplericity/macify/eawt/ApplicationEvent.java
org/simplericity/macify/eawt/ApplicationListener.java
org/simplericity/macify/eawt/DefaultApplication.java
+
+ # legacy applet wrapper thing.
+ # The launcher has to be there for silly FML/Forge relauncher.
net/minecraft/Launcher.java
- MCFrame.java
-)
+ org/multimc/legacy/LegacyLauncher.java
+ org/multimc/legacy/LegacyFrame.java
-add_jar(MultiMCLauncher ${SRC})
+ # onesix launcher
+ org/multimc/onesix/OneSixLauncher.java
+
+ # generic launcher
+ org/multimc/EntryPoint.java
+ org/multimc/Launcher.java
+ org/multimc/ParseException.java
+ org/multimc/Utils.java
+ org/multimc/IconLoader.java
+)
+add_jar(NewLaunch ${SRC})
-INSTALL_JAR(MultiMCLauncher "${BINARY_DEST_DIR}/jars")
+INSTALL_JAR(NewLaunch "${BINARY_DEST_DIR}/jars")